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

client_Zxw

2018-09-21 9b0bc3bddda6c82ea6f466bd04bf858d324af25b

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

 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -934,7 +934,7 @@
            }

        }



        if (!BattleEffectPlayRule.Instance.CanPlay(owner.ServerInstID))

        if (owner is GA_Player && !BattleEffectPlayRule.Instance.CanPlay(owner.ServerInstID))

        {

            return;

        }


 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)


 System/DailyQuest/DailyQuestWin.cs

@@ -32,6 +32,7 @@
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        PlayerTaskDatas taskModel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } }

        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }

        MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }



        public int guidingDailyQuestId = 0;



@@ -295,6 +296,13 @@
                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

                    WindowCenter.Instance.Open<PetWin>(false, 2);

                    break;

                case DailyQuestType.KillMonster:

                    var point = mapModel.GetRecommendHangPoint();

                    var mapEventConfig = Config.Instance.Get<MapEventPointConfig>(point);

                    mapModel.wannaLookLocalMap = mapEventConfig.MapID;

                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

                    WindowCenter.Instance.Open<LocalMapWin>();

                    break;

                default:

                    break;

            }


 System/DailyQuest/DayRemind.cs

@@ -45,6 +45,7 @@
    public const string OSGIFT_REDPOINT = "OSGitf_Redpoint";

    public const string TASK_SKILL_HOLE = "TaskSkillHole";

    public const string RUNE_SPECIAL_HOLE = "RuneSpecialHole";

    public const string LEAGUE_NOTICE_REDPOINT = "LeagueNoticeRedpoint";

    public Dictionary<string, int[]> dayRemindDic = new Dictionary<string, int[]>();



    public bool GetDayRemind(string _remindKey)

@@ -98,6 +99,7 @@
        SetDayRemind(OSGIFT_REDPOINT);

        SetDayRemind(TASK_SKILL_HOLE);

        SetDayRemind(RUNE_SPECIAL_HOLE);

        SetDayRemind(LEAGUE_NOTICE_REDPOINT);

    }



    private void SetDayRemind(string _key)


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

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

 System/Dungeon/DungeonModel.cs

@@ -496,15 +496,6 @@


        private string GroupChallengeOnlyOneTip(int _mapId)

        {

            switch (_mapId)

            {

                case 60010:

                    if (PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.trialDungeonGroupChallengeTipLv)

                    {

                        return Language.Get("SingleIntoFB");

                    }

                    break;

            }

            return Language.Get("FBEnter_OnlyYou");

        }




 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

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


 System/FairyAu/FairyLeagueModel.cs

@@ -9,7 +9,7 @@


namespace Snxxz.UI

{

    public class FairyLeagueModel : Model, IAfterPlayerDataInitialize, IBeforePlayerDataInitialize, IPlayerLoginOk

    public class FairyLeagueModel : Model, IAfterPlayerDataInitialize, IBeforePlayerDataInitialize, IPlayerLoginOk,IOpenServerActivity

    {

        public event Action OnRefreshFairyLeagueEvent;



@@ -123,9 +123,11 @@
            DTCA003_tagUniversalGameRecInfo.onGetUniversalGameInfo += OnGetUniversalGameInfo;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            TimeMgr.Instance.OnMinuteEvent += MinuteEvent;

            TimeMgr.Instance.OnDayEvent += DayEvent;

            fairyLeagueHelp = new FairyLeagueHelp();

            OpenServerActivityCenter.Instance.Register((int)OpenServerActivityCenter.OSActivityType.FairyLeagueNotice, this);

        }



        public override void UnInit()

@@ -154,6 +156,7 @@
            cacheLeagueStage = fairyLeagueStage;

            CheckFairyLeagueData();

            UpdateRedpoint();

            UpdateNoticeRedpoint();

            serverInited = true;

        }



@@ -244,6 +247,7 @@
        readonly List<int> fairyLeagueStateValues = new List<int>() { 11, 12, 13, 21, 22, 23 };

        FairyLeagueWeekTime fairyLeagueWeekTime = new FairyLeagueWeekTime();

        Dictionary<int, Dictionary<int, FairyLeagueWeekTime>> specialLeagueTimes = new Dictionary<int, Dictionary<int, FairyLeagueWeekTime>>();

        public Dictionary<int,int> leagueNoticeWeapons { get; private set; }

        private void ParseConfig()

        {

            FuncConfigConfig cfg = Config.Instance.Get<FuncConfigConfig>("FamilyMatchGuide");

@@ -351,12 +355,15 @@
            integralAddition = int.Parse(cfg.Numerical5);

            cfg = Config.Instance.Get<FuncConfigConfig>("FamilyMatchResourcePoint1");

            crystalRateDict = ConfigParse.GetDic<int, float>(cfg.Numerical1);

            cfg = Config.Instance.Get<FuncConfigConfig>("FamilyForcast");

            leagueNoticeWeapons = ConfigParse.GetDic<int, int>(cfg.Numerical1);

        }



        int GetIndexOfWeek(int _openWeekDay, int _openDays, out int dayOfWeek)

        {

            var index = (_openWeekDay + _openDays - 1) / 7;

            var index = (_openWeekDay + _openDays - 2) / 7;

            dayOfWeek = (_openWeekDay + _openDays - 1) % 7;

            dayOfWeek = dayOfWeek == 0 ? 7 : dayOfWeek;

            return index;

        }



@@ -905,6 +912,7 @@
        #region 红点

        private Redpoint m_LeagueRedpoint = new Redpoint(107, 10704);

        public Redpoint m_JoinFairyLeagueRedpoint { get; private set; }



        public void UpdateRedpoint()

        {

            m_JoinFairyLeagueRedpoint.state = RedPointState.None;

@@ -918,6 +926,115 @@
                return;

            }

            m_JoinFairyLeagueRedpoint.state = RedPointState.Simple;

        }

        #endregion



        #region 仙盟联赛预告

        private void OnFuncStateChangeEvent(int func)

        {

            if (func == 142)

            {

                if (onStateUpate != null)

                {

                    onStateUpate((int)OpenServerActivityCenter.OSActivityType.FairyLeagueNotice);

                }

                UpdateNoticeRedpoint();

            }

        }



        public event Action<int> onStateUpate;

        public bool IsOpen

        {

            get

            {

                return FuncOpen.Instance.IsFuncOpen(142) && !IsAfterFirstLeague();

            }

        }

        public bool IsAdvance

        {

            get { return false; }

        }



        public bool priorityOpen

        {

            get { return false; }

        }



        public int GetBeforeFirstLeagueTime()

        {

            var seconds = 0;

            if (TimeUtility.OpenWeekCnt <= 1)

            {

                if (IsAfterFirstLeague())

                {

                    return 0;

                }

                var weekTime = currentWeekTime == null ? nextWeekTime : currentWeekTime;

                var ring = weekTime.rings[0];

                var session = ring.sessions[0];

                var fightStage = session.stages.Find((x) =>

                {

                    return x.stage == FairyLeagueStage.Fight;

                });

                var time = TimeUtility.openServerTime.AddTicks((weekTime.rings[0].openServerDay - 1) * TimeSpan.TicksPerDay);

                time = new DateTime(time.Year, time.Month, time.Day, fightStage.startHour, fightStage.startMinute, 0);

                seconds = (int)(time - TimeUtility.ServerNow).TotalSeconds;

                seconds = Mathf.Max(seconds, 0);

            }

            return seconds;

        }



        public bool IsAfterFirstLeague()

        {

            if (TimeUtility.OpenWeekCnt <= 1)

            {

                var openServerTime = TimeUtility.openServerTime;

                var openServerWeekDay = openServerTime.DayOfWeek == DayOfWeek.Sunday ? 7 : (int)openServerTime.DayOfWeek;

                if (specialLeagueTimes.ContainsKey(openServerWeekDay))

                {

                    var dict = specialLeagueTimes[openServerWeekDay];

                    var weekCount = TimeUtility.OpenWeekCnt;

                    if (dict.ContainsKey(0) && weekCount > 0)

                    {

                        return true;

                    }

                    if (currentWeekTime == null)

                    {

                        return false;

                    }

                    var weekTime = currentWeekTime == null ? nextWeekTime : currentWeekTime;

                    if (weekTime.IsNextWeek)

                    {

                        return true;

                    }

                    if (weekTime.rings.Count > 1 && weekTime.currentRing == 1)

                    {

                        return true;

                    }

                    return weekTime.currentSession == 1 && weekTime.fairyLeagueStage == FairyLeagueStage.Over;

                }

            }

            return true;

        }



        Redpoint fairyLeagueNoticeRedpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20912);

        void UpdateNoticeRedpoint()

        {

            fairyLeagueNoticeRedpoint.state = RedPointState.None;

            if (!DayRemind.Instance.GetDayRemind(DayRemind.LEAGUE_NOTICE_REDPOINT)

                && IsOpen)

            {

                fairyLeagueNoticeRedpoint.state = RedPointState.Simple;

            }

        }



        public void SetViewLeagueNotice()

        {

            if (fairyLeagueNoticeRedpoint.state == RedPointState.Simple)

            {

                DayRemind.Instance.SetDayRemind(DayRemind.LEAGUE_NOTICE_REDPOINT, true);

                UpdateNoticeRedpoint();

            }

        }

        #endregion

    }

@@ -1093,6 +1210,8 @@


            public int dayOfWeek { get; set; }



            public int openServerDay { get; private set; }



            public void Sort()

            {

                sessions.Sort((Session x, Session y) =>

@@ -1122,6 +1241,8 @@


            public void ParseConfig(DungeonSpecialStateTimeConfig config, int dayOfWeek)

            {

                openServerDay = config.OpenServerDay;



                var session = sessions.Find((x) =>

                {

                    return x.session == (config.StateValue < 20 ? 0 : 1);


 System/FairyAu/FairyLeagueNoticeWin.cs

New file
@@ -0,0 +1,111 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Friday, September 21, 2018

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI {



    public class FairyLeagueNoticeWin : Window

    {

        [SerializeField] RectTransform m_ContainerNoFairy;

        [SerializeField] RectTransform m_ContainerHasFairy;

        [SerializeField] Button m_JoinFairy;

        [SerializeField] Button m_Goto;

        [SerializeField] RawImage[] m_RawWeapons;

        [SerializeField, Header("武器角度，职业1，2，3")] Vector3[] m_WeaponAngles;



        FairyLeagueModel model { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_JoinFairy.onClick.AddListener(JoinFairy);

            m_Goto.onClick.AddListener(Goto);

        }



        protected override void OnPreOpen()

        {

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyInfo;

            model.SetViewLeagueNotice();

            Display();

            DisplayWeapons();

        }



        protected override void OnAfterOpen()

        {



        }



        protected override void OnPreClose()

        {

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyInfo;

            UI3DModelExhibition.Instance.StopShow();

        }



        protected override void OnAfterClose()

        {



        }

        #endregion



        void Display()

        {

            m_ContainerNoFairy.gameObject.SetActive(!PlayerDatas.Instance.fairyData.HasFairy);

            m_ContainerHasFairy.gameObject.SetActive(PlayerDatas.Instance.fairyData.HasFairy);

        }



        private void Goto()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionFunc4);

        }

        private void JoinFairy()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionFunc3);

        }



        private void OnRefreshFairyInfo()

        {

            Display();

        }



        void DisplayWeapons()

        {

            var job = PlayerDatas.Instance.baseData.Job;

            var _rawImage = m_RawWeapons[0];

            var _angle = m_WeaponAngles[0];

            var _weaponId = model.leagueNoticeWeapons.ContainsKey(job) ? model.leagueNoticeWeapons[job] : 0;

            if (_weaponId == 0)

            {

                return;

            }

            for (int i = 0; i < m_RawWeapons.Length; i++)

            {

                m_RawWeapons[i].gameObject.SetActive(job == (i + 1));

                if ((i + 1) == job)

                {

                    _rawImage = m_RawWeapons[i];

                    _angle = m_WeaponAngles[i];

                }

            }

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

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

        }

    }



}










 System/FairyAu/FairyLeagueNoticeWin.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: c1c8b96d40cac8741ab435102d9d4549
timeCreated: 1537498840
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/FairyAu/KingTempleWin.cs

@@ -192,7 +192,7 @@
                    secondaryId = weapon2,

                };



                UI3DModelExhibition.Instance.BeginShowOtherPlayer(m_LeaderMob, data);

                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

@@ -89,7 +89,7 @@
            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);

        }




 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/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

@@ -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/Message/WordAnalysis.cs

@@ -10,8 +10,8 @@
    public static Regex Color_Start_Regex = new Regex(@"<color=#[0-9a-zA-Z]+>", RegexOptions.Singleline);

    public static Regex Color_End_Regex = new Regex(@"</color>", RegexOptions.Singleline);

    public static Regex Space_Regex = new Regex(@"<Space=([0-9]*)>", RegexOptions.Singleline);

    public static Regex Size_Start_Regex = new Regex(@"<Size=([0-9]+)>", RegexOptions.Singleline);

    public static Regex Size_End_Regex = new Regex(@"</Size>", RegexOptions.Singleline);

    public static Regex Size_Start_Regex = new Regex(@"<[Ss]ize=([0-9]+)>", RegexOptions.Singleline);

    public static Regex Size_End_Regex = new Regex(@"</[Ss]ize>", RegexOptions.Singleline);



    private static RichTextEventEnum eventType = RichTextEventEnum.TABLE;




 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/OpenServerActivity/ImpactRankModel.cs

@@ -781,7 +781,9 @@
            [Header("仙玉投资")]

            FairyInvest,

            [Header("VIP投资")]

            VipInvest

            VipInvest,

            [Header("仙盟联赛预告")]

            FairyLeagueNotice,

        }

    }




 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -29,6 +29,7 @@
                return m_OSRedEnvelopeModel ?? (m_OSRedEnvelopeModel = ModelCenter.Instance.GetModel<OSRedEnvelopeModel>());

            }

        }

        FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }



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

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

@@ -64,6 +65,7 @@
            impactRankModel.presentSelectType = impactDefaultType;

            impactRankModel.gotoImpactRankType = 0;

            envelopeModel.selectType = 1;

            GlobalTimeEvent.Instance.secondEvent += SecondEvent;

            CheckAlreadyOpen();

            UpdateFunctionBtns();

        }

@@ -121,6 +123,7 @@
            TimeUtility.OnServerOpenDayRefresh -= OnStepServerDayEvent;

            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;

            OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;

            GlobalTimeEvent.Instance.secondEvent -= SecondEvent;

            CloseOtherWin();

            impactRankModel.gotoImpactRankType = 0;

        }

@@ -165,6 +168,24 @@
            {

                openActivitys.Sort(Compare);

                return openActivitys[0];

            }

        }



        private void SecondEvent()

        {

            var cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyLeagueNotice);

            if (cell != null)

            {

                var activityCell = cell as OpenServerActivityCell;

                var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();

                if (seconds > 0)

                {

                    activityCell.title.text = UIHelper.ReplaceNewLine(Language.Get("FairyLeagueForcast", TimeUtility.SecondsToHMS(seconds)));

                }

                else

                {

                    activityCell.title.text = Language.Get("FamilyMatchName");

                }

            }

        }



@@ -224,6 +245,17 @@
                    if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipRealmPoint, out operationBase))

                    {

                        _cell.title.text = Language.Get("MultipleRealmPoint", Language.Get(StringUtility.Contact("Num_CHS_", (operationBase as OperationMultipleRealmPoint).multiplePractice)));

                    }

                    break;

                case 12:

                    var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();

                    if (seconds > 0)

                    {

                        _cell.title.text = UIHelper.ReplaceNewLine(Language.Get("FairyLeagueForcast", TimeUtility.SecondsToHMS(seconds)));

                    }

                    else

                    {

                        _cell.title.text = Language.Get("FamilyMatchName");

                    }

                    break;

                default:

@@ -471,7 +503,7 @@
                    }

                    else

                    {

                        WindowCenter.Instance.Open<FairyJadeInvestmentWin>();

                        WindowCenter.Instance.Open<FairyJadeInvestmentWin>(true);

                    }

                    break;

                case 11:

@@ -481,10 +513,19 @@
                    }

                    else

                    {

                        WindowCenter.Instance.Open<VipInvestWin>();

                        WindowCenter.Instance.Open<VipInvestWin>(true);

                    }

                    break;



                case 12:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<FairyLeagueNoticeWin>();

                    }

                    else

                    {

                        WindowCenter.Instance.Open<FairyLeagueNoticeWin>(true);

                    }

                    break;

            }

        }



@@ -518,6 +559,7 @@
            WindowCenter.Instance.CloseImmediately<LimitedTimePackageWin>();

            WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

            WindowCenter.Instance.CloseImmediately<VipInvestWin>();

            WindowCenter.Instance.CloseImmediately<FairyLeagueNoticeWin>();

        }



        private int Compare(int order_x, int order_y)


 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

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

            }

        }



@@ -275,7 +275,7 @@
                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)

            {

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

            m_RawBoss.gameObject.SetActive(true);

            UI3DModelExhibition.Instance.StopShow();

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

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

        }


 System/RoleParticulars/RoleParticularsWin.cs

@@ -257,7 +257,7 @@
                    wingsId=wing,

                    secondaryId=weapon2,

                };

                UI3DModelExhibition.Instance.BeginShowOtherPlayer(roleModel, data);

                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

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

@@ -67,13 +67,13 @@
                            PetInfoConfig petInfo = tipsModel.unlockPetDict[storeConfig.ItemID];

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

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

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

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

                            break;

                        case 41:

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

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

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

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

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

                            break;

                    }

                }


 System/Strengthening/WingsRefined.cs

@@ -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/Treasure/FairyTreasureCollectPanelPattern5.cs

@@ -276,32 +276,43 @@
            GetCurrentAchievement();

            if (treasure.state != TreasureState.Collected)

            {

                int unlocktreasureId = 0;

                var list = model.GetTreasureCategory(TreasureCategory.Human);

                for (int i = 0; i < list.Count; i++)

                //int unlocktreasureId = 0;

                //var list = model.GetTreasureCategory(TreasureCategory.Human);

                //for (int i = 0; i < list.Count; i++)

                //{

                //    Treasure _treasure;

                //    if(model.TryGetTreasure(list[i], out _treasure))

                //    {

                //        var index = _treasure.treasureStages.FindIndex((x) =>

                //        {

                //            return x.unlockType == TreasureStageUnlock.Treasure && x.treasure == treasure.id;

                //        });

                //        if (index != -1)

                //        {

                //            unlocktreasureId = list[i];

                //            break;

                //        }

                //    }

                //}



                //var unlockTreasureConfig = Config.Instance.Get<TreasureConfig>(unlocktreasureId);



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

                var requireCondition = 0;

                if (config != null)

                {

                    Treasure _treasure;

                    if(model.TryGetTreasure(list[i], out _treasure))

                    var successConfig = Config.Instance.Get<SuccessConfig>(config.Achievements.Length > 0 ? config.Achievements[0] : 0);

                    if (successConfig != null)

                    {

                        var index = _treasure.treasureStages.FindIndex((x) =>

                        {

                            return x.unlockType == TreasureStageUnlock.Treasure && x.treasure == treasure.id;

                        });

                        if (index != -1)

                        {

                            unlocktreasureId = list[i];

                            break;

                        }

                        requireCondition = successConfig.NeedCnt;

                    }

                }



                var unlockTreasureConfig = Config.Instance.Get<TreasureConfig>(unlocktreasureId);



                m_AchievementGetBtn.gameObject.SetActive(false);

                m_ActiveBtn.gameObject.SetActive(false);

                m_GotoGet.gameObject.SetActive(false);

                m_ContainerLocked.gameObject.SetActive(true);

                m_LockedDescription.text = Language.Get("BlastFurnaceGet", unlockTreasureConfig == null ? string.Empty : unlockTreasureConfig.Name);

                m_LockedDescription.text = Language.Get("BlastFurnaceGet", requireCondition);

                m_ContainerAchievement.gameObject.SetActive(false);

            }

            else if (currentAchievement == null || treasure.stage >= 1)


 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

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

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

                }

            }



@@ -143,13 +143,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);

                    }



                }


 System/WorldMap/LocalMapFindPath.cs

@@ -27,7 +27,7 @@
        private List<GameObject> pathNodeBehaviours = new List<GameObject>(); //寻路点池

        List<LocalMapTag> tagBehaviours = new List<LocalMapTag>();



        MapModel model { get { return  ModelCenter.Instance.GetModel<MapModel>(); } }

        MapModel model { get { return ModelCenter.Instance.GetModel<MapModel>(); } }



        int mapId = 0;

        public void Init(int _mapId)

@@ -42,7 +42,7 @@


            mapId = _mapId;

            var tagChinMap = Config.Instance.Get<MapConfig>(mapId);

            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();

            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(mapId, 0);

            var mapWidth = mapResConfig.MapScale.x;

            var mapHeight = mapResConfig.MapScale.y;




 UI/Common/UI3DModelExhibition.cs

@@ -77,7 +77,7 @@
            DontDestroyOnLoad(gameObject);

        }



        public void BeginShowLoginPlayer(RawImage _rawImage, int _job)

        public void ShowLoginPlayer(RawImage _rawImage, int _job)

        {

            var clothesItemId = 0;

            var weaponItemId = 0;

@@ -126,10 +126,10 @@
                isDialogue = false,

            };



            BeginShowPlayer(_rawImage, data);

            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;

@@ -167,10 +167,10 @@
                isDialogue = _isDialogue,

            };



            BeginShowPlayer(_rawImage, data);

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

@@ -212,10 +212,10 @@
                isDialogue = false,

            };



            BeginShowPlayer(_rawImage, data);

            ShowPlayer(_rawImage, data);

        }



        public void BeginShowPlayer(RawImage _rawImage, UI3DPlayerExhibitionData data)

        public void ShowPlayer(RawImage _rawImage, UI3DPlayerExhibitionData data)

        {

            StopShow();



@@ -259,7 +259,7 @@
            }

        }



        public void BeginShowOtherPlayer(RawImage _rawImage, UI3DPlayerExhibitionData data)

        public void ShowOtherPlayer(RawImage _rawImage, UI3DPlayerExhibitionData data)

        {

            StopShow();



@@ -296,16 +296,16 @@
            }

        }



        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 BeginShowHourse(int _modelId, RawImage _rawImage)

        public void ShowHourse(int _modelId, RawImage _rawImage)

        {

            StopShow();

            m_ShowCamera.enabled = true;

@@ -344,7 +344,7 @@
        }



        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;

@@ -374,7 +374,7 @@
            }

        }



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

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

        {

            StopShow();



@@ -417,12 +417,12 @@
            }

        }



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

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

        {

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

            ShowNPC(_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;


 Utility/EnumHelper.cs

@@ -309,6 +309,7 @@
    PersonalBoss = 25,

    ElderGodArea = 26,

    FairyGrabBoss = 27,

    KillMonster=28,

}



public enum ActivityPrepareType