System/BlastFurnace/StoveUpgradWin.cs
@@ -66,7 +66,7 @@ protected override void OnPreClose() { UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); UI3DTreasureExhibition.Instance.StopShow(); }
@@ -28,7 +28,7 @@ public void Dispose() { model.boxSurplusChangeEvent -= OnBoxInfoUpdate; UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); } private void OnBoxInfoUpdate() System/DogzDungeon/DogzEliteMonsterBehaviour.cs
@@ -27,7 +27,7 @@ public void Dispose() { model.boxSurplusChangeEvent -= OnGuardInfoUpdate; UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); } private void OnGuardInfoUpdate() System/Dungeon/TrialDungeonEntranceWin.cs
@@ -92,7 +92,7 @@ protected override void OnPreClose() { model.dungeonRecordChangeEvent -= UpdateDungeonTimes; UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); } protected override void OnAfterClose() System/FairyAu/FairyBoss.cs
@@ -323,7 +323,7 @@ protected override void OnAfterClose() { UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyBoss; PlayerDatas.Instance.fairyData.OnRefreshFairyBoss -= OnRefreshFairyBoss; TimeMgr.Instance.OnHourEvent -= OnRefreshFairyBoss; System/FairyAu/KingTempleWin.cs
@@ -82,7 +82,7 @@ protected override void OnPreClose() { model.UpdateKingFairyEvent -= UpdateKingFairyEvent; UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); } protected override void OnAfterClose() @@ -181,7 +181,18 @@ itemData = _leaderData.roleEquipDataDic[RoleEquipType.retWeapon2]; weapon2 = itemData.ItemID; } UI3DModelExhibition.Instance.BeginShowOtherPlayer(m_LeaderMob, _leaderData.rolePropData.Job, clothes, _suitEffect, weapon, wing, weapon2); var data = new UI3DModelExhibition.UI3DPlayerExhibitionData { job = _leaderData.rolePropData.Job, clothesId = clothes, suitLevel = _suitEffect, weaponId = weapon, wingsId = wing, secondaryId = weapon2, }; UI3DModelExhibition.Instance.BeginShowOtherPlayer(m_LeaderMob, data); m_LeaderNameTxt.text = _leaderData.rolePropData.Name; m_LeaderRealmImg.gameObject.SetActive(_leaderData.rolePropData.RealmLV > 0); var _realmCfg = Config.Instance.Get<RealmConfig>(_leaderData.rolePropData.RealmLV); System/FindPrecious/BossIntroduceBehaviour.cs
@@ -51,7 +51,7 @@ public void Dispose() { UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); } private void LateUpdate() @@ -95,7 +95,7 @@ protected virtual void DrawReward() { UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); m_ViewType = ViewType.Reward; m_ContainerReward.gameObject.SetActive(true); m_ContainerBossInfo.gameObject.SetActive(false); System/KnapSack/New/BagWin.cs
@@ -94,7 +94,7 @@ } protected override void OnAfterClose() { UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); } #endregion
@@ -97,9 +97,9 @@ } protected override void OnPreClose() { UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShowHourse(); UI3DModelExhibition.Instance.StopShowWing(); UI3DModelExhibition.Instance.StopShow(); UI3DModelExhibition.Instance.StopShow(); UI3DModelExhibition.Instance.StopShow(); UI3DTreasureExhibition.Instance.StopShow(); } protected override void OnAfterClose() @@ -296,9 +296,9 @@ m_RawImage3.gameObject.SetActive(false); m_RawImage4.gameObject.SetActive(false); m_FeaturesImage.gameObject.SetActive(false); UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShowHourse(); UI3DModelExhibition.Instance.StopShowWing(); UI3DModelExhibition.Instance.StopShow(); UI3DModelExhibition.Instance.StopShow(); UI3DModelExhibition.Instance.StopShow(); UI3DTreasureExhibition.Instance.StopShow(); var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID); bool Type = false; System/Mount/MountWin.cs
@@ -111,7 +111,7 @@ RidingAndPetActivationWin.FairyJadeDEvent -= FairyJadeDEvent; FlySkillIconWin.FairyJadeDEvent -= FairyJadeDEvent; OnClickStopDomesticateBtn(); UI3DModelExhibition.Instance.StopShowHourse(); UI3DModelExhibition.Instance.StopShow(); } protected override void LateUpdate() System/Realm/RealmPropertyUpWin.cs
@@ -95,7 +95,7 @@ protected override void OnPreClose() { UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); UI3DTreasureExhibition.Instance.StopShow(); flying = false; } System/Realm/RealmUpWin.cs
@@ -126,7 +126,7 @@ PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent; WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent; StopBoss(); UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); realmModel.realmDungeonState = false; if (cacheCoroutine != null) { @@ -153,7 +153,7 @@ yield return WaitingForSecondConst.WaitMS800; var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel); m_RawPlayer.gameObject.SetActive(false); UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); yield return WaitingForSecondConst.GetWaitForSeconds(m_DelayEnterTime > 0 ? m_DelayEnterTime : 1f); StartBoss(config, true); } @@ -281,21 +281,21 @@ { m_RawBoss.gameObject.SetActive(true); m_RawPlayer.gameObject.SetActive(false); UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); StartBoss(config); } } private void StopBoss() { UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); } private void StartBoss(RealmConfig config, bool act = false) { StopBoss(); m_RawBoss.gameObject.SetActive(true); UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); UI3DModelExhibition.Instance.BeginShowNPC(config.BossID, config.IsBigRealm == 1 ? Vector3.zero : direction, m_RawBoss, false); var npcConfig = Config.Instance.Get<NPCConfig>(config.BossID); var npcModel = UI3DModelExhibition.Instance.NpcModelPet; System/Role/RolePanel.cs
@@ -253,7 +253,7 @@ void OnDisableRole() { UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); } protected override void BindController() System/RoleParticulars/RoleParticularsWin.cs
@@ -136,7 +136,7 @@ protected override void OnAfterClose() { UI3DModelExhibition.Instance.StopShowPlayer(); UI3DModelExhibition.Instance.StopShow(); } #endregion @@ -248,7 +248,16 @@ { weapon2 = itemData.ItemID; } UI3DModelExhibition.Instance.BeginShowOtherPlayer(roleModel, viewPlayerData.rolePropData.Job, clothes, _suitLevel, weapon, wing, weapon2); var data = new UI3DModelExhibition.UI3DPlayerExhibitionData { job = viewPlayerData.rolePropData.Job, clothesId = clothes, suitLevel = _suitLevel, weaponId=weapon, wingsId=wing, secondaryId=weapon2, }; UI3DModelExhibition.Instance.BeginShowOtherPlayer(roleModel, data); } }
@@ -102,7 +102,7 @@ guideSweep = false; WindowCenter.Instance.uiRoot.eventSystem.enabled = true; m_Tower.Dispose(); UI3DModelExhibition.Instance.StopShowNPC(); UI3DModelExhibition.Instance.StopShow(); model.selectedFloorEvent -= OnSelectedFloorChange; dailyQuestModel.dailyQuestProgressUpdateEvent -= OnRuneTowerSweepResult; } System/Strengthening/WingsRefined.cs
@@ -134,7 +134,7 @@ PlusNum1.gameObject.SetActive(false); PlusNum2.gameObject.SetActive(false); StopCoroutine("AkeyRefining"); UI3DModelExhibition.Instance.StopShowWing(); UI3DModelExhibition.Instance.StopShow(); // RoleCameraCtrl.GetInstance().OnDestroyModel(); playerPack.RefreshPackAct -= ItemsToRefresh;//背包物品刷新 playerPack.ItemCntReduceAct -= BackpackRefresh;//背包物品清理 System/Vip/FirstRechargeWin.cs
@@ -104,7 +104,7 @@ { model.firstChargeRewardEvent -= UpdateButtonState; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent; UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); } protected override void OnAfterClose() System/Vip/FirstTimeRechargeWin.cs
@@ -78,7 +78,7 @@ } else { UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); m_RewardInformationImage.SetActive(false); } @@ -108,7 +108,7 @@ protected override void OnPreClose() { UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); MainInterfaceWin.IsCopyOfThePanel -= IsCopyOfThePanel; FirstTimeRechargeModel.FirstTimeRechargeTiime -= FirstTimeRechargeTiime; FirstTimeRechargeModel.FirstTimeRecharEffect -= FirstTimeRecharEffect; @@ -155,13 +155,13 @@ } else { UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); m_RewardInformationImage.SetActive(false); } } else { UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); m_RewardInformationImage.SetActive(false); } } @@ -174,18 +174,18 @@ { LocalSave.SetBool("FirstTimeRechargeBool", false); m_RewardInformationImage.SetActive(false); UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); } private void OnClickFirstFlush() { LocalSave.SetBool("FirstTimeRechargeBool", false); UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); m_RewardInformationImage.SetActive(false); if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding) { WindowCenter.Instance.CloseImmediately<MainInterfaceWin>(); } UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); if (WindowCenter.Instance.CheckOpen<FirstTimeRechargeWin>()) { WindowCenter.Instance.CloseImmediately<FirstTimeRechargeWin>(); @@ -200,7 +200,7 @@ m_TimeText.text = obj; if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing) { UI3DModelExhibition.Instance.StopShowEquipment(); UI3DModelExhibition.Instance.StopShow(); m_RewardInformationImage.SetActive(false); } } UI/Common/UI3DModelExhibition.cs
@@ -26,12 +26,8 @@ [SerializeField] ColorCorrectionCurves m_CameraColor; public bool interactable { get { return m_Interactable; } set { m_Interactable = value; } get { return m_Interactable; } set { m_Interactable = value; } } UI3DShowHero playerModel = new UI3DShowHero(); @@ -47,13 +43,10 @@ GameObject npcModel = null; SFXController m_NpcEffect; public GameObject NpcModelPet { get { return npcModel; get { return npcModel; } set { npcModel = value; } } set { npcModel = value; } } int m_WingModelId = 0; GameObject wingModel = null; @@ -70,13 +63,12 @@ PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } public static UI3DModelExhibition Instance { get; set; } public static UI3DModelExhibition Instance { get; private set; } public static void CreateStage() { var gameObject = GameObject.Instantiate(Resources.Load<GameObject>("UI/Prefabs/UI3DModelExhibitionStage")); var prefab = Resources.Load<GameObject>("UI/Prefabs/UI3DModelExhibitionStage"); var gameObject = GameObject.Instantiate(prefab); Instance = gameObject.GetComponent<UI3DModelExhibition>(); Instance.transform.position = new Vector3(1000, 2000, 3000); Instance.name = "UI3DModelExhibitionStage"; @@ -91,8 +83,9 @@ var weaponItemId = 0; var wingsItemId = 0; var secondaryItemId = 0; var _suitLevel = 0; var suitLevel = 0; var equipInfos = PlayerDatas.Instance.loginInfo.EquipInfo; for (int i = 0; i < equipInfos.Length; i++) { var equipInfo = equipInfos[i]; @@ -106,10 +99,10 @@ if (equipInfo.IsSuite == 1) { Dictionary<int, List<int>> _userDataDict = ConfigParse.Analysis(equipInfo.UserData); if (_userDataDict.ContainsKey(30)) var userDataDict = ConfigParse.Analysis(equipInfo.UserData); if (userDataDict.ContainsKey(30)) { _suitLevel = _userDataDict[30][0]; suitLevel = userDataDict[30][0]; } } break; @@ -122,7 +115,18 @@ } } BeginShowPlayer(_rawImage, _job, clothesItemId, _suitLevel, weaponItemId, wingsItemId, secondaryItemId, false); var data = new UI3DPlayerExhibitionData { job = _job, clothesId = clothesItemId, suitLevel = suitLevel, weaponId = weaponItemId, wingsId = wingsItemId, secondaryId = secondaryItemId, isDialogue = false, }; BeginShowPlayer(_rawImage, data); } public void BeginShowPlayer(RawImage _rawImage, int _job, bool _isDialogue = false) @@ -152,7 +156,18 @@ } } BeginShowPlayer(_rawImage, _job, clothesId, _suitLevel, weaponId, wingsId, secondaryId, _isDialogue); var data = new UI3DPlayerExhibitionData { job = _job, clothesId = clothesId, suitLevel = _suitLevel, weaponId = weaponId, wingsId = wingsId, secondaryId = secondaryId, isDialogue = _isDialogue, }; BeginShowPlayer(_rawImage, data); } public void BeginShowPlayer(RawImage _rawImage, int _job, RoleEquipType _exceptEquip) @@ -186,19 +201,38 @@ } } BeginShowPlayer(_rawImage, _job, clothesId, _suitLevel, weaponId, wingsId, secondaryId, false); var data = new UI3DPlayerExhibitionData { job = _job, clothesId = clothesId, suitLevel = _suitLevel, weaponId = weaponId, wingsId = wingsId, secondaryId = secondaryId, isDialogue = false, }; BeginShowPlayer(_rawImage, data); } public void BeginShowPlayer(RawImage _rawImage, int _job, int _clothesId, int suitLevel, int _weaponId, int _wingsId, int _secondaryId, bool _isDialogue = false) public void BeginShowPlayer(RawImage _rawImage, UI3DPlayerExhibitionData data) { StopShow(); var instance = playerModel.Show(_job, _clothesId, suitLevel, _weaponId, _wingsId, _secondaryId, _isDialogue ? m_DialogPoint : m_PlayerShowPoint); var job = data.job; var clothesId = data.clothesId; var suitLevel = data.suitLevel; var weaponId = data.weaponId; var wingsId = data.wingsId; var secondaryId = data.secondaryId; var isDialogue = data.isDialogue; interactable = !_isDialogue; var instance = playerModel.Show(job, clothesId, suitLevel, weaponId, wingsId, secondaryId, isDialogue ? m_DialogPoint : m_PlayerShowPoint); interactable = !isDialogue; m_PlayerShowPoint.localEulerAngles = Vector3.zero; if (_isDialogue) if (isDialogue) { instance.transform.localPosition = GeneralConfig.Instance.heroDialogueOffset; instance.transform.localEulerAngles = GeneralConfig.Instance.heroDialogueRotation; @@ -216,20 +250,29 @@ if (_rawImage != null) { _rawImage.rectTransform.sizeDelta = new Vector2(_rawImage.rectTransform.rect.height * 4f / 3, _rawImage.rectTransform.rect.height); m_InteractProcessor.rectTransform = _rawImage.rectTransform; var x = _rawImage.rectTransform.rect.height * 4f / 3; var y = _rawImage.rectTransform.rect.height; _rawImage.rectTransform.sizeDelta = new Vector2(x, y); _rawImage.texture = m_ShowCamera.targetTexture; _rawImage.material = MaterialUtility.GetGUIRenderTextureMaterial(); m_InteractProcessor.rectTransform = _rawImage.rectTransform; } } public void BeginShowOtherPlayer(RawImage _rawImage, int _job, int _clothesId, int suitEffect, int _weaponId, int _wingsId, int _secondaryId) public void BeginShowOtherPlayer(RawImage _rawImage, UI3DPlayerExhibitionData data) { StopShow(); playerModel.Show(_job, _clothesId, suitEffect, _weaponId, _wingsId, _secondaryId, m_PlayerShowPoint); var job = data.job; var clothesId = data.clothesId; var suitLevel = data.suitLevel; var weaponId = data.weaponId; var wingsId = data.wingsId; var secondaryId = data.secondaryId; playerModel.Show(job, clothesId, suitLevel, weaponId, wingsId, secondaryId, m_PlayerShowPoint); playerModel.UnloadClothedEffect(); playerModel.PutOnEffect(suitEffect); playerModel.PutOnEffect(suitLevel); interactable = true; m_PlayerShowPoint.localEulerAngles = Vector3.zero; @@ -244,10 +287,12 @@ if (_rawImage != null) { _rawImage.rectTransform.sizeDelta = new Vector2(_rawImage.rectTransform.rect.height * 4f / 3, _rawImage.rectTransform.rect.height); m_InteractProcessor.rectTransform = _rawImage.rectTransform; var x = _rawImage.rectTransform.rect.height * 4f / 3; var y = _rawImage.rectTransform.rect.height; _rawImage.rectTransform.sizeDelta = new Vector2(x, y); _rawImage.texture = m_ShowCamera.targetTexture; _rawImage.material = MaterialUtility.GetGUIRenderTextureMaterial(); m_InteractProcessor.rectTransform = _rawImage.rectTransform; } } @@ -260,11 +305,6 @@ } } public void StopShowPlayer() { StopShow(); } public void BeginShowHourse(int _modelId, RawImage _rawImage) { StopShow(); @@ -272,10 +312,12 @@ if (_rawImage != null) { _rawImage.rectTransform.sizeDelta = new Vector2(_rawImage.rectTransform.rect.height * 4f / 3, _rawImage.rectTransform.rect.height); m_InteractProcessor.rectTransform = _rawImage.rectTransform; var x = _rawImage.rectTransform.rect.height * 4f / 3; var y = _rawImage.rectTransform.rect.height; _rawImage.rectTransform.sizeDelta = new Vector2(x, y); _rawImage.texture = m_ShowCamera.targetTexture; _rawImage.material = MaterialUtility.GetGUIRenderTextureMaterial(); m_InteractProcessor.rectTransform = _rawImage.rectTransform; } var instance = UI3DModelFactory.LoadUIHorse(_modelId); @@ -291,15 +333,14 @@ horseModel = instance; m_HorseShowPoint.rotation = Quaternion.identity; var modelConfig = Config.Instance.Get<ModelResConfig>(_modelId); instance.transform.SetParentEx(m_HorseShowPoint, modelConfig.UIOffset, modelConfig.UIRotation, Vector3.one * modelConfig.UIScale); var position = modelConfig.UIOffset; var rotation = modelConfig.UIRotation; var scale = Vector3.one * modelConfig.UIScale; instance.transform.SetParentEx(m_HorseShowPoint, position, rotation, scale); instance.SetActive(true); ResetCameraColor(); } public void StopShowHourse() { StopShow(); } private GameObject ObjEquipment; @@ -324,29 +365,27 @@ ResetCameraColor(); if (_rawImage != null) { _rawImage.rectTransform.sizeDelta = new Vector2(_rawImage.rectTransform.rect.height * 4f / 3, _rawImage.rectTransform.rect.height); m_InteractProcessor.rectTransform = _rawImage.rectTransform; var x = _rawImage.rectTransform.rect.height * 4f / 3; var y = _rawImage.rectTransform.rect.height; _rawImage.rectTransform.sizeDelta = new Vector2(x, y); _rawImage.texture = m_ShowCamera.targetTexture; _rawImage.material = MaterialUtility.GetGUIRenderTextureMaterial(); m_InteractProcessor.rectTransform = _rawImage.rectTransform; } } public void StopShowEquipment() { StopShow(); } public void BeginShowWing(int _modelId, Vector3 _localEulerAngles, RawImage _rawImage) { StopShow(); m_ShowCamera.enabled = true; if (_rawImage != null) { _rawImage.rectTransform.sizeDelta = new Vector2(_rawImage.rectTransform.rect.height * 4f / 3, _rawImage.rectTransform.rect.height); m_InteractProcessor.rectTransform = _rawImage.rectTransform; var x = _rawImage.rectTransform.rect.height * 4f / 3; var y = _rawImage.rectTransform.rect.height; _rawImage.rectTransform.sizeDelta = new Vector2(x, y); _rawImage.texture = m_ShowCamera.targetTexture; _rawImage.material = MaterialUtility.GetGUIRenderTextureMaterial(); m_InteractProcessor.rectTransform = _rawImage.rectTransform; } var instance = UI3DModelFactory.LoadUIWing(_modelId); @@ -355,6 +394,7 @@ return; } m_ShowCamera.enabled = true; isShowWing = true; interactable = true; @@ -363,7 +403,11 @@ m_WingShowPoint.rotation = Quaternion.identity; var modelConfig = Config.Instance.Get<ModelResConfig>(_modelId); instance.transform.SetParentEx(m_WingShowPoint, modelConfig.UIOffset, modelConfig.UIRotation, Vector3.one * modelConfig.UIScale); var position = modelConfig.UIOffset; var rotation = modelConfig.UIRotation; var scale = Vector3.one * modelConfig.UIScale; instance.transform.SetParentEx(m_WingShowPoint, position, rotation, scale); instance.SetActive(true); ResetCameraColor(); var animator = instance.GetComponent<Animator>(); @@ -371,11 +415,6 @@ { animator.Play("UI_Idle_Single"); } } public void StopShowWing() { StopShow(); } public void BeginShowNPC(int _npcId, Vector3 _localEulerAngles, RawImage _rawImage, bool _gray = false, bool _isDialogue = false) @@ -390,10 +429,12 @@ if (_rawImage != null) { _rawImage.rectTransform.sizeDelta = new Vector2(_rawImage.rectTransform.rect.height * 4f / 3, _rawImage.rectTransform.rect.height); m_InteractProcessor.rectTransform = _rawImage.rectTransform; var x = _rawImage.rectTransform.rect.height * 4f / 3; var y = _rawImage.rectTransform.rect.height; _rawImage.rectTransform.sizeDelta = new Vector2(x, y); _rawImage.texture = m_ShowCamera.targetTexture; _rawImage.material = MaterialUtility.GetGUIRenderTextureMaterial(); m_InteractProcessor.rectTransform = _rawImage.rectTransform; } var instance = UI3DModelFactory.LoadUINPC(_npcId); @@ -434,11 +475,6 @@ ResetCameraColor(_gray); m_CameraColor.saturation = _gray ? 0.08f : 1f; } public void StopShowNPC() { StopShow(); } public void StopShow() @@ -535,11 +571,11 @@ { if (isShowinEquipment && ObjEquipment != null) { if (WindowCenter.Instance.CheckOpen<FirstTimeRechargeWin>()) if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin")) { ObjEquipment.transform.Rotate(WindowCenter.Instance.Get<FirstTimeRechargeWin>().RotateVector * 1f, Space.Self); } if (WindowCenter.Instance.CheckOpen<FirstChargeTrialWin>()) if (WindowCenter.Instance.CheckOpen("FirstChargeTrialWin")) { ObjEquipment.transform.Rotate(WindowCenter.Instance.Get<FirstChargeTrialWin>().RotateVector * 1f, Space.Self); } @@ -596,9 +632,18 @@ { return; } } public struct UI3DPlayerExhibitionData { public int job; public int clothesId; public int suitLevel; public int weaponId; public int wingsId; public int secondaryId; public bool isDialogue; } } } UI/Common/UI3DShowHero.cs
@@ -26,7 +26,6 @@ RuntimeAnimatorController cacheClothedAC; Transform showPoint; List<SFXController> closthesSFXList = new List<SFXController>(); public GameObject Show(int _job, int _clothes, int suitID, int _weaponId, int _wingsId, int _secondaryId, Transform _showPoint) @@ -450,21 +449,8 @@ wingsId = newWings; } private PlayerSuitModel _suitModel; private PlayerSuitModel SuitModel { get { return _suitModel ?? (_suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>()); } } private PlayerPackModel m_PlayerBackModel; private PlayerPackModel PlayerBackModel { get { return m_PlayerBackModel ?? (m_PlayerBackModel = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } private PlayerSuitModel SuitModel { get { return ModelCenter.Instance.GetModel<PlayerSuitModel>(); } } private PlayerPackModel PlayerBackModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } public void LoadClothesEffect(int clothedID, int suitLevel) {
