Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-09-21 06bac38d743f3f99a294f20e5b02af6d53676b0b

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/ConfigManager.cs

@@ -523,8 +523,7 @@
                lines = File.ReadAllLines(path, Encoding.UTF8);

                break;

            case AssetPath.External:

                var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("config/", fileName, ".txt"));

                path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, assetVersion.relativePath);

                path = AssetVersionUtility.GetAssetFilePath(StringUtility.Contact("config/", fileName, ".txt"));

                lines = File.ReadAllLines(path, Encoding.UTF8);

                break;

        }


 Fight/MapTransferUtility.cs

@@ -752,7 +752,7 @@
            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(mapId, 0);

            var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));



            if (!assetVersion.IsPriorAsset())

            if (assetVersion != null && !assetVersion.IsPriorAsset())

            {

                InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole);

                return false;


 Fight/Stage/MapEditor/GuideDialogueWin.cs

@@ -142,7 +142,7 @@
            playerName.text = PlayerDatas.Instance.baseData.PlayerName;

            playerContent.text = m_DialogConfig.content;



            UI3DModelExhibition.Instance.BeginShowPlayer(playerIcon, PlayerDatas.Instance.baseData.Job, true);

            UI3DModelExhibition.Instance.ShowPlayer(playerIcon, PlayerDatas.Instance.baseData.Job, true);

        }

        else

        {

@@ -153,7 +153,7 @@
            npcContent.text = m_DialogConfig.content;



            var npcConfig = Config.Instance.Get<NPCConfig>(m_DialogConfig.npcId);

            UI3DModelExhibition.Instance.BeginShowNPC(m_DialogConfig.npcId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, npcIcon, false, true);

            UI3DModelExhibition.Instance.ShowNPC(m_DialogConfig.npcId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, npcIcon, false, true);

        }



        if (m_DialogConfig.TalkID != 0)


 Fight/Stage/StageManager.cs

@@ -17,40 +17,32 @@
    public event Action<float> loadingProgressEvent;



    bool m_IsServerPreparing = false;

    public bool isServerPreparing

    {

    public bool isServerPreparing {

        get { return m_IsServerPreparing; }

        set { m_IsServerPreparing = value; }

    }



    public Stage.E_StageType StageType

    {

        get

        {

    public Stage.E_StageType StageType {

        get {

            return m_StageType;

        }

    }



    public Stage CurrentStage

    {

        get

        {

    public Stage CurrentStage {

        get {

            return m_CurrentStage;

        }

    }



    int m_CurrentMapId;

    public int currentMapId

    {

    public int currentMapId {

        get { return m_CurrentMapId; }

        private set { m_CurrentMapId = value; }

    }



    int m_CurrentMapResID;

    public int currentMapResId

    {

        get

        {

    public int currentMapResId {

        get {

            return m_CurrentMapResID;

        }

        private set { m_CurrentMapResID = value; }

@@ -61,11 +53,9 @@




    float m_LoadingProgress = 0f;

    float loadingProgress

    {

    float loadingProgress {

        get { return m_LoadingProgress; }

        set

        {

        set {

            m_LoadingProgress = value;

            if (loadingProgressEvent != null)

            {

@@ -98,7 +88,7 @@
        else

        {

            var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));

            if (assetVersion.IsPriorAsset())

            if (assetVersion != null && assetVersion.IsPriorAsset())

            {

                SnxxzGame.Instance.StartCoroutine(LoadCoroutine<T>(stageId, mapResConfig.ID, mapResConfig.MapResources, true));

            }


 System/AssetVersion/AssetVersionUtility.cs

@@ -18,16 +18,23 @@
    static bool m_PriorAssetDownLoadDone = false;

    public static bool priorAssetDownLoadDone {

        get {

            switch (VersionConfig.Get().assetAccess)

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
            {
                return true;
            }

            else

            {

                case InstalledAsset.NullAsset:

                case InstalledAsset.HalfAsset:

                case InstalledAsset.FullAsset:

                    return m_PriorAssetDownLoadDone;

                case InstalledAsset.IngoreDownLoad:

                    return true;

                default:

                    return true;

                switch (VersionConfig.Get().assetAccess)

                {

                    case InstalledAsset.NullAsset:

                    case InstalledAsset.HalfAsset:

                    case InstalledAsset.FullAsset:

                        return m_PriorAssetDownLoadDone;

                    case InstalledAsset.IngoreDownLoad:

                        return true;

                    default:

                        return true;

                }

            }

        }

    }

@@ -35,16 +42,23 @@
    static bool m_UnPriorAssetDownLoadDone = false;

    public static bool unPriorAssetDownLoadDone {

        get {

            switch (VersionConfig.Get().assetAccess)

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
            {
                return true;
            }

            else

            {

                case InstalledAsset.NullAsset:

                case InstalledAsset.HalfAsset:

                case InstalledAsset.FullAsset:

                    return m_UnPriorAssetDownLoadDone;

                case InstalledAsset.IngoreDownLoad:

                    return true;

                default:

                    return true;

                switch (VersionConfig.Get().assetAccess)

                {

                    case InstalledAsset.NullAsset:

                    case InstalledAsset.HalfAsset:

                    case InstalledAsset.FullAsset:

                        return m_UnPriorAssetDownLoadDone;

                    case InstalledAsset.IngoreDownLoad:

                        return true;

                    default:

                        return true;

                }

            }

        }

    }

@@ -179,7 +193,7 @@
        }

        else

        {

            path = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, _assetKey);

            path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, _assetKey);

        }



        return path;

@@ -187,13 +201,18 @@

    public static bool IsUnpriorAssetDownLoadOk()

    {

        if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
        {
            return true;
        }



        if (VersionConfig.Get().assetAccess == InstalledAsset.IngoreDownLoad)

        {

            return true;

        }



        return unPriorAssetDownLoadDone;

    }

    
    }





}

 System/BlastFurnace/StoveUpgradWin.cs

@@ -66,7 +66,7 @@


        protected override void OnPreClose()

        {

            UI3DModelExhibition.Instance.StopShowPlayer();

            UI3DModelExhibition.Instance.StopShow();

            UI3DTreasureExhibition.Instance.StopShow();

        }




 System/Compose/New/ComposeWin.cs

@@ -67,7 +67,7 @@
        protected override void OnPreOpen()

        {

            ComposeModel.ResetModel();

            if(WindowJumpMgr.Instance.IsJumpState)

            if(WindowJumpMgr.Instance.IsJumpState && WindowJumpMgr.Instance.jumpType == 1)

            {

                if(ComposeModel.CurComposeModel != null)

                {

@@ -154,14 +154,19 @@
        {

            ComposeModel.ResetJumpToModel();

            selectModel.ClearSelectModel();

          
        }



        protected override void OnAfterClose()

        {



            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

               
            }

            if(WindowJumpMgr.Instance.jumpType != 1)

            {

                ComposeModel.SetCurComposeModel(null);

            }

        }

        #endregion


 System/DogzDungeon/DogzBoxBehaviour.cs

@@ -20,7 +20,7 @@
        public void Display()
        {
            timer = 0f;
            UI3DModelExhibition.Instance.BeginShowNPC(model.bigBoxNpcId, Vector3.zero, m_RawImage);
            UI3DModelExhibition.Instance.ShowNPC(model.bigBoxNpcId, Vector3.zero, m_RawImage);
            DisplayBoxSurplusInfo();
            model.boxSurplusChangeEvent += OnBoxInfoUpdate;
        }
@@ -28,7 +28,7 @@
        public void Dispose()
        {
            model.boxSurplusChangeEvent -= OnBoxInfoUpdate;
            UI3DModelExhibition.Instance.StopShowNPC();
            UI3DModelExhibition.Instance.StopShow();
        }

        private void OnBoxInfoUpdate()

 System/DogzDungeon/DogzEliteMonsterBehaviour.cs

@@ -19,7 +19,7 @@
        public void Display()
        {
            timer = 0f;
            UI3DModelExhibition.Instance.BeginShowNPC(model.eliteMonsters[0], Vector3.zero, m_RawImage);
            UI3DModelExhibition.Instance.ShowNPC(model.eliteMonsters[0], Vector3.zero, m_RawImage);
            DisplayGuardSurplusInfo();
            model.boxSurplusChangeEvent += OnGuardInfoUpdate;
        }
@@ -27,7 +27,7 @@
        public void Dispose()
        {
            model.boxSurplusChangeEvent -= OnGuardInfoUpdate;
            UI3DModelExhibition.Instance.StopShowNPC();
            UI3DModelExhibition.Instance.StopShow();
        }

        private void OnGuardInfoUpdate()

 System/Dungeon/DungeonModel.cs

@@ -1168,7 +1168,7 @@
                var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(_dataMapId, _lineId);

                var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));



                if (!assetVersion.IsPriorAsset())

                if (assetVersion != null && !assetVersion.IsPriorAsset())

                {

                    InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole);

                    return;


 System/Dungeon/NormalDungeonEntranceWin.cs

@@ -133,7 +133,7 @@
                }

                else

                {

                    UI3DModelExhibition.Instance.BeginShowNPC(dungeonConfig.BossActorID[0], Vector3.zero, m_BossPortrayal);

                    UI3DModelExhibition.Instance.ShowNPC(dungeonConfig.BossActorID[0], Vector3.zero, m_BossPortrayal);

                }



            }


 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()

@@ -151,7 +151,7 @@
        void DisplayBossInfo(int _npcId)

        {

            m_BossName.gameObject.SetActive(true);

            UI3DModelExhibition.Instance.BeginShowNPC(_npcId, Vector3.zero, m_BossPortrayal);

            UI3DModelExhibition.Instance.ShowNPC(_npcId, Vector3.zero, m_BossPortrayal);

            var npcConfig = Config.Instance.Get<NPCConfig>(_npcId);

            if (npcConfig != null)

            {


 System/FairyAu/FairyBoss.cs

@@ -159,7 +159,7 @@


        void OnShowFairyBossModel()

        {

            UI3DModelExhibition.Instance.BeginShowNPC(fairyBossModel.fairyBossNpcId, Vector3.zero, model);

            UI3DModelExhibition.Instance.ShowNPC(fairyBossModel.fairyBossNpcId, Vector3.zero, model);

        }



        private void OnFoodGetWay()

@@ -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.ShowOtherPlayer(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/BossHomeWin.cs

@@ -103,7 +103,7 @@
                        m_BossIntroduce.gameObject.SetActive(false);

                        m_ContainerMonster.gameObject.SetActive(true);

                        m_BossIntroduce.Dispose();

                        UI3DModelExhibition.Instance.BeginShowNPC(model.selectedBoss, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_MonsterPortrait);

                        UI3DModelExhibition.Instance.ShowNPC(model.selectedBoss, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_MonsterPortrait);

                        m_MonsterLevel.text = Language.Get("Z1024", npcConfig.NPCLV);

                        break;

                    case 2:

@@ -193,7 +193,7 @@
                    m_ContainerMonster.gameObject.SetActive(true);

                    m_BossIntroduce.Dispose();

                    var npcConfig = Config.Instance.Get<NPCConfig>(_bossId);

                    UI3DModelExhibition.Instance.BeginShowNPC(_bossId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_MonsterPortrait);

                    UI3DModelExhibition.Instance.ShowNPC(_bossId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_MonsterPortrait);

                    m_MonsterLevel.text = Language.Get("Z1024", npcConfig.NPCLV);

                    break;

                case 2:


 System/FindPrecious/BossIntroduceBehaviour.cs

@@ -51,7 +51,7 @@


        public void Dispose()

        {

            UI3DModelExhibition.Instance.StopShowNPC();

            UI3DModelExhibition.Instance.StopShow();

        }



        private void LateUpdate()

@@ -89,13 +89,13 @@
            var config = Config.Instance.Get<NPCConfig>(bossId);

            m_BossName.text = config.charName;

            m_BossLevel.text = Language.Get("Z1024", config.NPCLV);

            UI3DModelExhibition.Instance.BeginShowNPC(bossId, config.UIModeLOffset, config.UIModelRotation, m_BossPortrait);

            UI3DModelExhibition.Instance.ShowNPC(bossId, config.UIModeLOffset, config.UIModelRotation, m_BossPortrait);

            m_BossAbility.Display(bossId);

        }



        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/FriendSystem/MailAllModel.cs

@@ -475,8 +475,10 @@
    }



    StringBuilder todayDailySB = new StringBuilder();

    List<int> dailyIdlist = new List<int>();

    public string GetTodayDailyNotify(DateTime getTime)

    {

        dailyIdlist.Clear();

        todayDailySB.Length = 0;

        var dayOfWeek = (int)getTime.DayOfWeek;

        var quests = dailyModel.GetQuestByWeekTime(dayOfWeek % 7);

@@ -487,6 +489,11 @@
            int openTime = openTimelist[i];

            for (int j = 0;j < quests[openTime].Count; j++)

            {

                if(dailyIdlist.Contains(quests[openTime][j]))

                {

                    continue;

                }

                dailyIdlist.Add(quests[openTime][j]);

                DailyQuestOpenTime dailyQuestOpenTime;

                dailyModel.TryGetOpenTime(quests[openTime][j], out dailyQuestOpenTime);

                if (dailyQuestOpenTime.IsValidServerOpenTime())


 System/KnapSack/Logic/ModelShowPerfab.cs

@@ -37,11 +37,11 @@
                    UI3DTreasureExhibition.Instance.BeginShowTreasure(id, modelImg);

                    break;

                case ModelShowType.mount:

                    UI3DModelExhibition.Instance.BeginShowHourse(id, modelImg);

                    UI3DModelExhibition.Instance.ShowHourse(id, modelImg);

                    break;

                case ModelShowType.pet:

                    var config = Config.Instance.Get<NPCConfig>(id);

                    UI3DModelExhibition.Instance.BeginShowNPC(id, config.UIModeLOffset, config.UIModelRotation, modelImg);

                    UI3DModelExhibition.Instance.ShowNPC(id, config.UIModeLOffset, config.UIModelRotation, modelImg);

                    break;

            }




 System/KnapSack/New/BagWin.cs

@@ -94,7 +94,7 @@
        }



        protected override void OnAfterClose() {

            UI3DModelExhibition.Instance.StopShowPlayer();

            UI3DModelExhibition.Instance.StopShow();

        }

        #endregion




 System/KnapSack/New/RoleEquipWin.cs

@@ -120,7 +120,7 @@


        protected override void OnPreOpen()

        {

            UI3DModelExhibition.Instance.BeginShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);

            UI3DModelExhibition.Instance.ShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);

            playerPack.RefreshAttrActiveAct += ControlEffect;

            playerPack.ItemCntAddAct += PutOnEquip;

            playerPack.ItemCntReduceAct += PutOffEquip;

@@ -157,7 +157,7 @@
        {

            if (typeof(PetMatInfoWin).Name != window.name && typeof(ItemInfoWin).Name != window.name) return;



            UI3DModelExhibition.Instance.BeginShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);

            UI3DModelExhibition.Instance.ShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);

        }



        protected override void OnAfterOpen()

@@ -256,7 +256,7 @@
            {

                _roleEquipDict.Add(itemModel.itemInfo.ItemPlace,itemModel);

            }

            UI3DModelExhibition.Instance.BeginShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);

            UI3DModelExhibition.Instance.ShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);



        }



@@ -266,7 +266,7 @@


            ClearEquipInfo(place);

            equipArealist[(RoleEquipType)place].transform.Find("ItemCell").gameObject.SetActive(false);

            UI3DModelExhibition.Instance.BeginShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);

            UI3DModelExhibition.Instance.ShowPlayer(RoleShowBG, PlayerDatas.Instance.baseData.Job);

        }



        private void OnClickEquipIntensify(GameObject go)


 System/MainInterfacePanel/DialogueDuidanceWin.cs

@@ -253,7 +253,7 @@


                int playerJob = PlayerDatas.Instance.baseData.Job;



                UI3DModelExhibition.Instance.BeginShowPlayer(m_playerIcon, playerJob, true);

                UI3DModelExhibition.Instance.ShowPlayer(m_playerIcon, playerJob, true);



                m_PlayerNameText.text = PlayerDatas.Instance.baseData.PlayerName;



@@ -297,7 +297,7 @@


                string npcIcon = configStoryMissions.NpcIcon[IsMultistage];



                UI3DModelExhibition.Instance.BeginShowNPC(npcId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_NPCIcon, false, true);

                UI3DModelExhibition.Instance.ShowNPC(npcId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_NPCIcon, false, true);

            }

            typesPeaker = type;

        }


 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -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;

@@ -321,12 +321,12 @@
                case (int)FeatureNoticeEnum.Pet:

                    m_RawImage1.gameObject.SetActive(true);

                    var npcConfig = Config.Instance.Get<NPCConfig>(50106001);

                    UI3DModelExhibition.Instance.BeginShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);

                    UI3DModelExhibition.Instance.ShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);

                    break;

                case (int)FeatureNoticeEnum.Horse:

                    m_RawImage2.gameObject.SetActive(true);

                    HorseConfig _model = Config.Instance.Get<HorseConfig>(100);

                    UI3DModelExhibition.Instance.BeginShowHourse(_model.Model, m_RawImage2);

                    UI3DModelExhibition.Instance.ShowHourse(_model.Model, m_RawImage2);

                    break;

                case (int)FeatureNoticeEnum.Wing:

                    m_RawImage3.gameObject.SetActive(true);

@@ -336,13 +336,13 @@
                    {

                        var config = Config.Instance.Get<WingRefineExpConfig>(3711);

                        int _modelID = config.Model;

                        UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);

                        UI3DModelExhibition.Instance.ShowWing(_modelID, vec3, m_RawImage3);

                    }

                    else if (job == 2)

                    {

                        var config = Config.Instance.Get<WingRefineExpConfig>(3721);

                        int _modelID = config.Model;

                        UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);

                        UI3DModelExhibition.Instance.ShowWing(_modelID, vec3, m_RawImage3);

                    }

                    break;

                case (int)FeatureNoticeEnum.GossipFurnace:


 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -229,6 +229,7 @@


            if (allMissionDict.ContainsKey(MissionID))

            {

                int missionState = allMissionDict[MissionID].MissionState;

                if (allMissionDict[MissionID].MissionState != MissionState && MissionState == 3 && AutomaticityBool)

                {

                    if (CompletionOfTaskEvent != null)

@@ -238,10 +239,21 @@
                }

                TaskChanges(MissionID, MissionState, DiscriptionIndex);//任务的状态修改



                if (Event_TaskRefreshes != null)//刷新任务

                if (missionState == 0 && (MissionState == 1 || MissionState==2))

                {

                    Event_TaskRefreshes(MissionID);

                    if (Event_TaskToAdd != null)//任务添加（用于存储于身上的未接取任务的特殊处理）

                    {

                        Event_TaskToAdd(MissionID, MissionState, DiscriptionIndex);

                    }

                }

                else

                {

                    if (Event_TaskRefreshes != null)//刷新任务

                    {

                        Event_TaskRefreshes(MissionID);

                    }

                }

                
            }

            else

            {


 System/Mount/MountPanelAssignment.cs

@@ -195,7 +195,7 @@
            if (HorseID != mount_ID)

            {

                HorseConfig _model = Config.Instance.Get<HorseConfig>(HorseID);

                UI3DModelExhibition.Instance.BeginShowHourse(_model.Model, m_MountRawImg);

                UI3DModelExhibition.Instance.ShowHourse(_model.Model, m_MountRawImg);

                mount_ID = HorseID;

                if (UI3DModelExhibition.Instance.NpcModelHorse != null)

                {


 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/Pet/PetAttributeMethods.cs

@@ -612,7 +612,7 @@
                typePetID = PetID;

                timePlay = 0;

                var npcConfig = Config.Instance.Get<NPCConfig>(PetID);

                UI3DModelExhibition.Instance.BeginShowNPC(PetID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, _rawImage);

                UI3DModelExhibition.Instance.ShowNPC(PetID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, _rawImage);

                if (UI3DModelExhibition.Instance.NpcModelPet != null)

                {

                    var animator = UI3DModelExhibition.Instance.NpcModelPet.GetComponent<Animator>();


 System/Pet/RidingAndPetActivationWin.cs

@@ -155,7 +155,7 @@
            HorseConfig Horseconfig = Config.Instance.Get<HorseConfig>(ActivateID);

            int InitFightPower = 0;

            InitFightPower += Horseconfig.InitFightPower;

            UI3DModelExhibition.Instance.BeginShowHourse(Horseconfig.Model, m_RawImageMount);

            UI3DModelExhibition.Instance.ShowHourse(Horseconfig.Model, m_RawImageMount);

            MountSkills.Clear();

            foreach (var key in mountModel.GetMountSkillAndItem.Keys)

            {

@@ -228,7 +228,7 @@
            HorseConfig Horseconfig = Config.Instance.Get<HorseConfig>(ActivateID);

            int InitFightPower = 0;

            InitFightPower += Horseconfig.InitFightPower;

            UI3DModelExhibition.Instance.BeginShowHourse(Horseconfig.Model, m_RawImageMount);

            UI3DModelExhibition.Instance.ShowHourse(Horseconfig.Model, m_RawImageMount);

            MountSkills.Clear();

            foreach (var key in mountModel.GetMountSkillAndItem.Keys)

            {

@@ -267,7 +267,7 @@
            m_RawImagePet.gameObject.SetActive(true);

            m_RawImageMount.gameObject.SetActive(false);

            var npcConfig = Config.Instance.Get<NPCConfig>(ActivateID);

            UI3DModelExhibition.Instance.BeginShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            UI3DModelExhibition.Instance.ShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            PetInfoConfig petInfoConfig = Config.Instance.Get<PetInfoConfig>(ActivateID);

            int InitFightPower = int.Parse(petInfoConfig.InitFightPower);

            string StrPetSkill = petInfoConfig.SkillID;

@@ -317,7 +317,7 @@
            m_RawImageMount.gameObject.SetActive(false);



            var npcConfig = Config.Instance.Get<NPCConfig>(ActivateID);

            UI3DModelExhibition.Instance.BeginShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            UI3DModelExhibition.Instance.ShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            // StartCoroutine("FrameDelay");

            PetInfoConfig petInfoConfig = Config.Instance.Get<PetInfoConfig>(ActivateID);

            int InitFightPower = int.Parse(petInfoConfig.InitFightPower);


 System/Realm/RealmPropertyUpWin.cs

@@ -95,7 +95,7 @@


        protected override void OnPreClose()

        {

            UI3DModelExhibition.Instance.StopShowPlayer();

            UI3DModelExhibition.Instance.StopShow();

            UI3DTreasureExhibition.Instance.StopShow();

            flying = false;

        }

@@ -248,7 +248,7 @@
                case ActivateShow.ActivateFunc.Realm:

                    m_ModelRawImage.gameObject.SetActive(true);

                    m_ModelRawImage.rectTransform.sizeDelta = new Vector2(680, 510);

                    UI3DModelExhibition.Instance.BeginShowPlayer(m_ModelRawImage, PlayerDatas.Instance.baseData.Job, RoleEquipType.retWing);

                    UI3DModelExhibition.Instance.ShowPlayer(m_ModelRawImage, PlayerDatas.Instance.baseData.Job, RoleEquipType.retWing);

                    break;

                case ActivateShow.ActivateFunc.GodWeapon:

                    m_ModelRawImage.gameObject.SetActive(true);


 System/Realm/RealmUpWin.cs

@@ -98,7 +98,7 @@
                StopBoss();

                m_RawBoss.gameObject.SetActive(false);

                m_RawPlayer.gameObject.SetActive(true);

                UI3DModelExhibition.Instance.BeginShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);

                UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);

            }

        }



@@ -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);

        }

@@ -275,28 +275,28 @@
                m_RawPlayer.gameObject.SetActive(true);

                StopBoss();

                m_RawBoss.gameObject.SetActive(false);

                UI3DModelExhibition.Instance.BeginShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);

                UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);

            }

            else if (_realmPoint >= config.NeedGood)

            {

                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.BeginShowNPC(config.BossID, config.IsBigRealm == 1 ? Vector3.zero : direction, m_RawBoss, false);

            UI3DModelExhibition.Instance.StopShow();

            UI3DModelExhibition.Instance.ShowNPC(config.BossID, config.IsBigRealm == 1 ? Vector3.zero : direction, m_RawBoss, false);

            var npcConfig = Config.Instance.Get<NPCConfig>(config.BossID);

            var npcModel = UI3DModelExhibition.Instance.NpcModelPet;

            m_RawBoss.transform.localPosition = config.IsBigRealm == 1 ? m_BossPositions[1] : m_BossPositions[0];


 System/Role/RolePanel.cs

@@ -194,7 +194,7 @@
            OnUpdateSpecialAttr();

            OnUpdateLvExp();

            m_PlayerFightPower.text = PlayerDatas.Instance.baseData.FightPoint.ToString();

            UI3DModelExhibition.Instance.BeginShowPlayer(m_PlayerShowModel, PlayerDatas.Instance.baseData.Job);

            UI3DModelExhibition.Instance.ShowPlayer(m_PlayerShowModel, PlayerDatas.Instance.baseData.Job);

            OnRefreshRealm();

            OnRefreshWorldLv();

        }

@@ -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.ShowOtherPlayer(roleModel, data);

            }

        }




 System/RoleParticulars/ViewHorseDetailWin.cs

@@ -176,7 +176,7 @@
        {

            m_RawModel.gameObject.SetActive(true);

            var config = Config.Instance.Get<HorseConfig>(id);

            UI3DModelExhibition.Instance.BeginShowHourse(config.Model, m_RawModel);

            UI3DModelExhibition.Instance.ShowHourse(config.Model, m_RawModel);

            if (UI3DModelExhibition.Instance.NpcModelHorse != null)

            {

                var animator = UI3DModelExhibition.Instance.NpcModelHorse.GetComponent<Animator>();


 System/RoleParticulars/ViewPetDetailWin.cs

@@ -162,7 +162,7 @@
        {

            m_RawModel.gameObject.SetActive(true);

            var npcConfig = Config.Instance.Get<NPCConfig>(id);

            UI3DModelExhibition.Instance.BeginShowNPC(id, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawModel);

            UI3DModelExhibition.Instance.ShowNPC(id, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawModel);

            if (UI3DModelExhibition.Instance.NpcModelPet != null)

            {

                var animator = UI3DModelExhibition.Instance.NpcModelPet.GetComponent<Animator>();


 System/RuneTower/RuneTowerWin.cs

@@ -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;

        }

@@ -192,7 +192,7 @@
            m_BossName.text = npcConfig.charName;

            m_BossLevel.text = Language.Get("HeadUpName_Monster", npcConfig.NPCLV);



            UI3DModelExhibition.Instance.BeginShowNPC(towerFloorConfig.BossId, new Vector3(0, 30, 0), m_BossPortrait);

            UI3DModelExhibition.Instance.ShowNPC(towerFloorConfig.BossId, new Vector3(0, 30, 0), m_BossPortrait);



            var challengable = !model.allTowerCompleted && model.selectedFloor == model.currentFloor;

            if (challengable)


 System/Store/PetAndMountPushWin.cs

@@ -11,6 +11,7 @@
        [SerializeField] RawImage rawImag;

        [SerializeField] Button closeBtn;

        [SerializeField] RichText m_Goto;

        [SerializeField] Text fightPower;



        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -65,12 +66,14 @@
                            titleText.text = Language.Get("StorePetPush");

                            PetInfoConfig petInfo = tipsModel.unlockPetDict[storeConfig.ItemID];

                            var config = Config.Instance.Get<NPCConfig>(petInfo.ID);

                            UI3DModelExhibition.Instance.BeginShowNPC(petInfo.ID, config.UIModeLOffset, config.UIModelRotation,rawImag);

                            fightPower.text = petInfo.ShowFightPower.ToString();

                            UI3DModelExhibition.Instance.ShowNPC(petInfo.ID, config.UIModeLOffset, config.UIModelRotation,rawImag);

                            break;

                        case 41:

                            titleText.text = Language.Get("StoreMountPush");

                            HorseConfig horseConfig = tipsModel.unlockMountDict[storeConfig.ItemID];

                            UI3DModelExhibition.Instance.BeginShowHourse(horseConfig.Model,rawImag);

                            fightPower.text = horseConfig.ShowFightPower.ToString();

                            UI3DModelExhibition.Instance.ShowHourse(horseConfig.Model,rawImag);

                            break;

                    }

                }


 System/Strengthening/GodBeastAttributes.cs

@@ -108,10 +108,18 @@
            }

            if (m_DoubleToggle.isOn)

            {

                if (ListIndex.Count <= 0)

                {

                    return;

                }

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 1);

            }

            else

            {

                if (ListIndex.Count <= 0)

                {

                    return;

                }

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

            }

        }

@@ -150,8 +158,10 @@
                        }

                    }

                }

                m_UIAlphaTween.gameObject.SetActive(true);

                m_FrameNull.SetActive(true);

                m_FullLevel.SetActive(false);

                m_StrengthenBtn.interactable = true;

                GetDogZLevelAndExp();

                AttributeAssignment();

            }

@@ -167,9 +177,12 @@
                m_TextAttributes2.gameObject.SetActive(false);

                m_TextAttributesAdd1.gameObject.SetActive(false);

                m_TextAttributesAdd2.gameObject.SetActive(false);

                m_StrengthenDoubleBtn.gameObject.SetActive(false);

                m_Text_two.SetActive(false);

                m_FrameNull.SetActive(false);

                m_FullLevel.SetActive(false);

                m_UIAlphaTween.gameObject.SetActive(false);

                m_StrengthenBtn.interactable = false;

            }

        }




 System/Strengthening/GodBeastReinforcementWin.cs

@@ -29,6 +29,7 @@
        [SerializeField] GodBeastSlidingList m_GodBeastSlidingList;
        [SerializeField] GameObject m_Listprompt_Text;

        [SerializeField] GodBeastAttributes m_GodBeastAttributes;

        [SerializeField] UIEffect m_UIEffect;

        DogzModel Dogz_model;

        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }

        PlayerPackModel _playerPack;

@@ -87,7 +88,7 @@
        protected override void OnAfterOpen()
        {
            playerPack.RefreshItemCountAct += RefreshItemCountAct;

            DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;
            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;
        }

        protected override void OnPreClose()
@@ -95,14 +96,14 @@
            godBeastModel.ItemPlace = -1;

            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

            DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;
            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;
        }



        private void MakeItemAnswerEvent(HA814_tagMCMakeItemAnswer obj)

        private void MakeItemAnswerEvent(H0721_tagMakeItemAnswer obj)

        {

            if ((int)obj.MakeType == (int)MakeType.Def_mitDogzEquipPlus)

            {



                m_UIEffect.Play();

            }

        }




 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;//背包物品清理

@@ -592,7 +592,7 @@
        _wingRawImage.gameObject.SetActive(true);

        var config = Config.Instance.Get<WingRefineExpConfig>((int)itemModel.itemInfo.ItemID);

        int _modelID = config.Model;

        UI3DModelExhibition.Instance.BeginShowWing(_modelID, Vec, _wingRawImage);

        UI3DModelExhibition.Instance.ShowWing(_modelID, Vec, _wingRawImage);

    }






 System/Vip/FirstChargeTrialWin.cs

@@ -69,7 +69,7 @@
            {

                int _weaponId = firstTimeRechargeModel.TryOutDic[job];

                var config = Config.Instance.Get<ItemConfig>(_weaponId);

                UI3DModelExhibition.Instance.BeginShowEquipment(config.ChangeOrd, _angle, _rawImage);

                UI3DModelExhibition.Instance.ShowEquipment(config.ChangeOrd, _angle, _rawImage);

                ItemCellModel ItemModel = new ItemCellModel(_weaponId,true,0,1);

                m_ItemCell.Init(ItemModel);

                m_ItemCell.cellBtn.RemoveAllListeners();


 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()

@@ -205,7 +205,7 @@
                }

            }

            var config = Config.Instance.Get<ItemConfig>(_weaponId);

            UI3DModelExhibition.Instance.BeginShowEquipment(config.ChangeOrd, _angle, _rawImage);

            UI3DModelExhibition.Instance.ShowEquipment(config.ChangeOrd, _angle, _rawImage);

        }

    }




 System/Vip/FirstTimeRechargeWin.cs

@@ -78,7 +78,7 @@
            }

            else

            {

                UI3DModelExhibition.Instance.StopShowEquipment();

                UI3DModelExhibition.Instance.StopShow();

                m_RewardInformationImage.SetActive(false);

            }



@@ -89,13 +89,13 @@
                {

                    m_RawImageBoy.gameObject.SetActive(true);

                    m_RawImageGirl.gameObject.SetActive(false);

                    UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);

                    UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);

                }

                else

                {

                    m_RawImageBoy.gameObject.SetActive(false);

                    m_RawImageGirl.gameObject.SetActive(true);

                    UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);

                    UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);

                }

            }



@@ -108,7 +108,7 @@


        protected override void OnPreClose()

        {

            UI3DModelExhibition.Instance.StopShowEquipment();

            UI3DModelExhibition.Instance.StopShow();

            MainInterfaceWin.IsCopyOfThePanel -= IsCopyOfThePanel;

            FirstTimeRechargeModel.FirstTimeRechargeTiime -= FirstTimeRechargeTiime;

            FirstTimeRechargeModel.FirstTimeRecharEffect -= FirstTimeRecharEffect;

@@ -143,25 +143,25 @@
                    {

                        m_RawImageBoy.gameObject.SetActive(true);

                        m_RawImageGirl.gameObject.SetActive(false);

                        UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);

                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);

                    }

                    else

                    {

                        m_RawImageBoy.gameObject.SetActive(false);

                        m_RawImageGirl.gameObject.SetActive(true);

                        UI3DModelExhibition.Instance.BeginShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);

                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);

                    }



                }

                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);

            }

        }


 System/WindowJump/WindowJumpMgr.cs

@@ -49,7 +49,7 @@


    public bool IsJumpState { get; private set; }

    private int jumpPhase = 0;



    public int jumpType { get; private set; }

    public void GetPreAllOpenWin()

    {

        jumpPhase += 1;

@@ -79,6 +79,7 @@
    {

        IsJumpState = false;

        jumpPhase = 0;

        jumpType = 0;

        openWindows.Clear();

        jumpWinNameDict.Clear();

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;

@@ -833,6 +834,7 @@
                IsJumpState = false;

                openWindows.Clear();

                jumpWinNameDict.Clear();

                jumpType = 0;

                jumpPhase = 0;

                break;

        }

@@ -876,9 +878,9 @@


    private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window

    {



        string curOpenWin = typeof(T).Name;

        jumpWinNameDict.Add(jumpPhase, curOpenWin);

        jumpType = _tagWinSearchModel.Type;

        switch (_tagWinSearchModel.Type)

        {

            case 1:

@@ -921,7 +923,7 @@
        }

        DebugEx.Log("关闭界面类型：" + _tagWinSearchModel.Type);

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;



        jumpType = _tagWinSearchModel.Type;

        int i = 0;

        List<string> openWinlist = null;

        switch (_tagWinSearchModel.Type)


 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;

            }

            set {

                npcModel = value;

            }

            get { return npcModel; }

            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";

@@ -85,14 +77,15 @@
            DontDestroyOnLoad(gameObject);

        }



        public void BeginShowLoginPlayer(RawImage _rawImage, int _job)

        public void ShowLoginPlayer(RawImage _rawImage, int _job)

        {

            var clothesItemId = 0;

            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,10 +115,21 @@
                }

            }



            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,

            };



            ShowPlayer(_rawImage, data);

        }



        public void BeginShowPlayer(RawImage _rawImage, int _job, bool _isDialogue = false)

        public void ShowPlayer(RawImage _rawImage, int _job, bool _isDialogue = false)

        {

            var clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

@@ -152,10 +156,21 @@
                }

            }



            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,

            };



            ShowPlayer(_rawImage, data);

        }



        public void BeginShowPlayer(RawImage _rawImage, int _job, RoleEquipType _exceptEquip)

        public void ShowPlayer(RawImage _rawImage, int _job, RoleEquipType _exceptEquip)

        {

            var clothes = _exceptEquip == RoleEquipType.retClothes ?

                null : playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);

@@ -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,

            };



            ShowPlayer(_rawImage, data);

        }



        public void BeginShowPlayer(RawImage _rawImage, int _job, int _clothesId, int suitLevel, int _weaponId, int _wingsId, int _secondaryId, bool _isDialogue = false)

        public void ShowPlayer(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 ShowOtherPlayer(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,38 +287,37 @@


            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 BeginShowSitDownPlayer(RawImage _rawImage, int _job)

        public void ShowSitDownPlayer(RawImage _rawImage, int _job)

        {

            BeginShowPlayer(_rawImage, _job);

            ShowPlayer(_rawImage, _job);

            if (playerModel != null)

            {

                playerModel.SitDown();

            }

        }



        public void StopShowPlayer()

        {

            StopShow();

        }



        public void BeginShowHourse(int _modelId, RawImage _rawImage)

        public void ShowHourse(int _modelId, 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.LoadUIHorse(_modelId);

@@ -291,19 +333,18 @@
            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;

        public void BeginShowEquipment(int _modelId, Vector3 _localEulerAngles, RawImage _rawImage)

        public void ShowEquipment(int _modelId, Vector3 _localEulerAngles, RawImage _rawImage)

        {

            var instance = UI3DModelFactory.LoadUIWing(_modelId);

            ObjEquipment = instance;

@@ -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()

        public void ShowWing(int _modelId, Vector3 _localEulerAngles, RawImage _rawImage)

        {

            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>();

@@ -373,27 +417,24 @@
            }

        }



        public void StopShowWing()

        public void ShowNPC(int _npcId, Vector3 _localEulerAngles, RawImage _rawImage, bool _gray = false, bool _isDialogue = false)

        {

            StopShow();

            ShowNPC(_npcId, Vector3.zero, _localEulerAngles, _rawImage, _gray, _isDialogue);

        }



        public void BeginShowNPC(int _npcId, Vector3 _localEulerAngles, RawImage _rawImage, bool _gray = false, bool _isDialogue = false)

        {

            BeginShowNPC(_npcId, Vector3.zero, _localEulerAngles, _rawImage, _gray, _isDialogue);

        }



        public void BeginShowNPC(int _npcId, Vector3 _offset, Vector3 _localEulerAngles, RawImage _rawImage, bool _gray = false, bool _isDialogue = false)

        public void ShowNPC(int _npcId, Vector3 _offset, Vector3 _localEulerAngles, RawImage _rawImage, bool _gray = false, bool _isDialogue = false)

        {

            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.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)

        {