Merge branch 'MainWinAdjust'

client_Wu Xijin

2019-03-27 44b5b3201f08c119429f5ec6da982677e47569a2

Merge branch 'MainWinAdjust'

# Conflicts:
#	System/MainInterfacePanel/HighSettingTip.cs
#	System/MainInterfacePanel/LowSettingTip.cs

 Core/SDK/SDKUtility.cs

@@ -889,7 +889,7 @@
    /// </summary>

    public void FreePlatformPay(string title, float money, string cpInfo)

    {

        m_PaymentTable["ProductID"] = "snxxz";

        m_PaymentTable["ProductID"] = "xbqy";

        m_PaymentTable["OperatorID"] = VersionConfig.Get().appId;

        // 取玩家区服ID

        m_PaymentTable["RegionName"] = "s" + ServerListCenter.Instance.currentServer.region_flag;

@@ -1135,7 +1135,7 @@
    {

        BuildFreePlatformInfo(data);



        string _url = StringUtility.Contact("http://pub.game.2460web.com:11000/event_receiver?ProductID=snxxz",

        string _url = StringUtility.Contact("http://pub.game.2460web.com:11000/event_receiver?ProductID=xbqy",

        "&OperatorID=", VersionConfig.Get().appId,

         "&RegionName=data&RegionID=0&EventID=1105&Time=",

          DateTime.Now.ToString(),


 System/MainInterfacePanel/AnimationFadeOut.cs

@@ -26,7 +26,6 @@


        [SerializeField] CanvasGroup m_CanvasGroup;



        [SerializeField] GameObject m_ShadeObj;

        Dictionary<int, List<Transform>> AnimationFadeOutDic = new Dictionary<int, List<Transform>>();

        Dictionary<int, Transform> tranDic = new Dictionary<int, Transform>();



@@ -41,26 +40,26 @@
        {

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;

        }



        public void FadeOut()//淡出

        {

            m_Animator.Play("MainFadeIn");

            m_ShadeObj.SetActive(false);

        }

        public void FadeIn()//淡入

        {

            m_Animator.Play("MainFadeOut");

            m_ShadeObj.SetActive(true);

        }



        public void ImmediatelyAppear()//立刻出现

        {

            m_Animator.Play("ImmediatelyAppear", 0, 1);

            m_ShadeObj.SetActive(true);

        }



        public void FadeAtOnce()//立刻消失

        {

            m_Animator.Play("FadeAtOnce", 0, 1);

            m_ShadeObj.SetActive(false);

        }



        public bool GetIsFadeIn()//是否淡入

        {

            if (m_CanvasGroup.alpha < 0.5)

@@ -178,8 +177,6 @@
            switch (index)

            {

                case 0:





                    tran.SetParent(lineFadeOut.OneParent);

                    tran.localPosition = Vector3.zero;

                    break;

@@ -199,9 +196,6 @@
                default:

                    break;

            }







        }



        private void PositionReduction()//还原位置（把盒子中的位置全部重新拉出来）


 System/MainInterfacePanel/ChatFrame.cs

@@ -20,7 +20,6 @@
        [SerializeField] Button _MailBtn;//邮件按钮

        [SerializeField] Button _OneKeyBtn;//地图挂机

        [SerializeField] Button _AutoBtn;//自动挂机  

        [SerializeField] Button _FriendsBtn;//好友按钮

        [SerializeField] Button _BackPack1Btn;//背包按钮

        [SerializeField] Button _SetupBtn;



@@ -28,20 +27,13 @@
        [SerializeField] GameObject AutoImg;//原地挂机



        [SerializeField] Button m_TaskBtn;//任务按钮

        [SerializeField] Button m_SocialBtn;//社交按钮

        [SerializeField] Button m_TeamBtn;//队伍按钮

        [SerializeField] Button m_RealmBtn;//境界按钮

        [SerializeField] Image m_RealmLV;//境界等级

        [SerializeField] RedpointBehaviour m_RealmRed;

        [SerializeField] UIEffect m_RealmSfx;



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

        TeamModel m_Model;

        TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }

        RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }

        CoinTaskTipModel m_CoinTaskTip;

        CoinTaskTipModel coinTaskTip { get { return m_CoinTaskTip ?? (m_CoinTaskTip = ModelCenter.Instance.GetModel<CoinTaskTipModel>()); } }



        CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }

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

        CoinTaskTipModel coinTaskTip { get { return ModelCenter.Instance.GetModel<CoinTaskTipModel>(); } }



        public void Init()

        {

@@ -60,22 +52,18 @@
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            _TongVoiceBtn.voiceRecordSuccessEvent += OnVoiceRecordFairySuccessEvent;

            _TeamChatBtn.voiceRecordSuccessEvent += OnVoiceRecordTeamSuccessEvent;

            PlayerDatas.Instance.playerDataRefreshEvent += Updatefighting;//数据的刷新(h0418)

            RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;

            _MailBtn.onClick.AddListener(MailButton);

            _OneKeyBtn.onClick.AddListener(OneKeyButton);

            _AutoBtn.onClick.AddListener(AutoButton);

            _FriendsBtn.onClick.AddListener(TeamBtn);

            _BackPack1Btn.onClick.AddListener(BackPack1Buton);

            _SetupBtn.onClick.AddListener(OnSetBtn);

            m_TaskBtn.AddListener(TaskButton);

            m_TeamBtn.AddListener(FriendsButton);

            m_RealmBtn.AddListener(OnRealmButton);

            _MailBtn.SetListener(MailButton);

            _OneKeyBtn.SetListener(OneKeyButton);

            _AutoBtn.SetListener(AutoButton);

            _BackPack1Btn.SetListener(BackPack1Buton);

            _SetupBtn.SetListener(OnSetBtn);

            m_TaskBtn.SetListener(TaskButton);

            m_SocialBtn.SetListener(FriendsButton);

            m_TeamBtn.SetListener(OpenTeam);

            myTeamRefreshEvent();

            OnRefreshFairyInfo();

            CheckRealmSfx();

            MailCountChange();

            GetRealmLevel();



            if (PlayerDatas.Instance.hero != null)

            {

                if (PlayerDatas.Instance.hero.aiHandler.IsAuto())

@@ -83,8 +71,6 @@
                    OnHeroHandupAIStopPassive();

                }

            }



            _FriendsBtn.gameObject.SetActive(!CrossServerUtility.IsCrossServerOneVsOne());

        }



        public void OnAfterOpen()

@@ -126,10 +112,6 @@
                OnRefreshFairyInfo();

                myTeamRefreshEvent();

            }

            if ((FuncOpenEnum)_type == FuncOpenEnum.Realm)

            {

                GetRealmLevel();

            }

        }



        private void MailCountChange()

@@ -168,55 +150,14 @@
            _MailBtn.gameObject.SetActive(isShowMail);

        }



        private void GetRealmLevel()//关于境界

        {

            int realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var realmConfig = RealmConfig.Get(realmLevel);

            if (FuncOpen.Instance.IsFuncOpen(12))

            {

                if (realmConfig != null && realmConfig.Lv > 0)

                {

                    m_RealmLV.SetSprite(realmConfig.Img);

                }

                else

                {

                    m_RealmLV.SetSprite("NoRealm");

                }

            }

            else

            {

                m_RealmLV.SetSprite("NoRealm");

            }



        }



        public void CheckRealmSfx()

        {

            var _model = ModelCenter.Instance.GetModel<RealmModel>();

            if (realmModel.levelUpRedpoint.state == RedPointState.Simple)

            {

                m_RealmRed.gameObject.SetActive(false);

                if (!m_RealmSfx.IsPlaying)

                {

                    m_RealmSfx.Play();

                }

            }

            else

            {

                m_RealmRed.gameObject.SetActive(true);

            }

        }



        private void OnSetBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();



            WindowCenter.Instance.Open<SettingUpWin>(false, 3);

        }



        private void TaskButton()

        {



            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<TaskWin>();

            if (coinTaskTip.IsPopup)

@@ -225,10 +166,9 @@
            }

        }



        private void TeamBtn()

        private void OpenTeam()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();



            if (model.myTeam.inTeam)

            {

                WindowCenter.Instance.Open<TeamFrameWin>(false, 1);

@@ -237,8 +177,8 @@
            {

                WindowCenter.Instance.Open<TeamFrameWin>(false, 0);

            }



        }



        public void UnInit()

        {

            _TongVoiceBtn.voiceRecordSuccessEvent -= OnVoiceRecordFairySuccessEvent;

@@ -249,26 +189,6 @@
            HeroBehaviour.OnStopHandupAI -= OnHeroHandupAIStopPassive;

            HeroBehaviour.OnStartHandupAI -= OnHeroHandupAIStarted;

            MailAllModel.Instance.DeleteMailEvent -= MailCountChange;

            PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting;//数据的刷新(h0418)

            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            m_RealmBtn.RemoveAllListeners();

            _MailBtn.onClick.RemoveAllListeners();

            _OneKeyBtn.onClick.RemoveAllListeners();

            _AutoBtn.onClick.RemoveAllListeners();

            _FriendsBtn.onClick.RemoveAllListeners();

            _BackPack1Btn.onClick.RemoveAllListeners();

            _SetupBtn.onClick.RemoveAllListeners();

            m_TeamBtn.RemoveAllListeners();

            m_TaskBtn.RemoveAllListeners();



        }



        private void RedpointValueChangeEvent(int _id)

        {

            if (_id == realmModel.levelUpRedpoint.id)

            {

                CheckRealmSfx();

            }

        }



        private void OnRefreshFairyInfo()

@@ -312,9 +232,6 @@


        void FriendsButton()

        {

            //MainRedDot.Instance.redPointFriendChat.state = RedPointState.None;

            //ChatCtrl.Inst.presentChatType = ChatInfoType.Friend;

            //WindowCenter.Instance.Open<ChatWin>();

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<SocialWin>();

        }

@@ -327,11 +244,6 @@
        void TongVoiceButton()

        {

            SysNotifyMgr.Instance.ShowTip("UnopenedFunction");

        }

        private void OnRealmButton()

        {

            WindowCenter.Instance.Open<RealmTransitionWin>();

            //WindowCenter.Instance.Close<MainInterfaceWin>();

        }



        void MailButton()//邮件按钮

@@ -472,6 +384,7 @@
                AutoImg.SetActive(false);

            }

        }



        private bool IsDungeon()//判断是否再副本中

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

@@ -479,15 +392,6 @@
            return mapConfig != null && mapConfig.MapFBType != 0;

        }



        void Updatefighting(PlayerDataType _tCDBPlayerRefresh)//数据的刷新

        {

            switch (_tCDBPlayerRefresh)

            {

                case PlayerDataType.RealmLevel:

                    GetRealmLevel();

                    break;

            }

        }

    }






 System/MainInterfacePanel/HighSettingTip.cs

@@ -20,12 +20,10 @@
        [SerializeField] Button _ShoppingBtn;//商城按钮

        [SerializeField] Button _RechargeBtn;//充值按钮

        [SerializeField] Button _WelfareBtn;//福利按钮

        [SerializeField] Button _TreasureBtn;//寻宝按钮

        [SerializeField] Button m_OpenService;//开服活动按钮

        [SerializeField] Button _RuneTaBtn;//符印按钮



        [SerializeField] Image m_OpenServerTitle;





        [SerializeField] Transform m_HighSettingTip;//判定



@@ -38,7 +36,6 @@
        [SerializeField] Button storeDesBtn;  //商城活动描述信息



        [SerializeField] HighSettingFadeInFadeOut m_HighSettingFadeInFadeOut;

        [SerializeField] Button m_Treasure;//法宝入口



        [SerializeField] Button m_HappyXBBtn;//寻宝入口

        [SerializeField] Button m_FindHostBtn;//仙宝寻主

@@ -79,11 +76,9 @@
            m_LootPrecious.AddListener(LootPreciousButton);

            _MarketBtn.AddListener(MarketButton);

            _ShoppingBtn.AddListener(ShoppingButton);

            _TreasureBtn.AddListener(TreasureButton);

            _WelfareBtn.AddListener(WelfareButton);

            _DaTreasureBtn.AddListener(DaTreasureButton);

            _RechargeBtn.AddListener(RechargeButton);

            m_Treasure.AddListener(OpenTreasure);

            _ShowBtn.AddListener(ShowButton);

            _ColseBtn.AddListener(ColseButton);

            m_HappyXBBtn.AddListener(OnClickHappyXBBtn);

@@ -139,11 +134,9 @@
            m_LootPrecious.RemoveAllListeners();

            _MarketBtn.RemoveAllListeners();

            _ShoppingBtn.RemoveAllListeners();

            _TreasureBtn.RemoveAllListeners();

            _WelfareBtn.RemoveAllListeners();

            _DaTreasureBtn.RemoveAllListeners();

            _RechargeBtn.RemoveAllListeners();

            m_Treasure.RemoveAllListeners();

            _ShowBtn.RemoveAllListeners();

            _ColseBtn.RemoveAllListeners();

            m_OpenService.RemoveAllListeners();

@@ -209,7 +202,6 @@
        {

            int _order = 0;

            m_OpenService.gameObject.SetActive(OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _order));

            //m_OpenServerTitle.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "WZ_ZJM_29" : "W_HuoDong");

        }



        private void OnMainHighTipCdTime()

@@ -243,10 +235,6 @@
            }

        }



        void TreasureButton()//寻宝按钮

        {



        }

        void WelfareButton()//福利按钮

        {

            WelfareCenter.Instance.OpenWelfare();

@@ -297,35 +285,6 @@
        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<TowerWin>(false, 0);

        }

        void OpenTreasure()

        {

            var _model = ModelCenter.Instance.GetModel<TreasureModel>();

            if (!_model.SatisfyEntranceOpen())

            {

                _model.DisplayEntranceLimitHint();

                return;

            }

            WindowCenter.Instance.Close<MainInterfaceWin>();

            if (_model.IsRequireUnlockAnim(TreasureCategory.Human) != 0)

            {

                _model.currentCategory = TreasureCategory.Human;

            }

            else if (_model.IsRequireUnlockAnim(TreasureCategory.Demon) != 0)

            {

                _model.currentCategory = TreasureCategory.Demon;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])

                == RedPointState.Simple)

            {

                _model.currentCategory = TreasureCategory.Human;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Demon - 1])

                == RedPointState.Simple)

            {

                _model.currentCategory = TreasureCategory.Demon;

            }

            WindowCenter.Instance.Open<TreasureSelectWin>();

        }



        void OnClickHappyXBBtn()//寻宝

@@ -434,19 +393,15 @@
                CoroutineMgr.Instance.OnMainStopCorUP();

            }

        }



        public void ShowButtonNow()//向上（立刻出现）

        {



            _ColseBtn.gameObject.SetActive(true);

            _ShowBtn.gameObject.SetActive(false);

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                m_HighSettingFadeInFadeOut.PositionNow();//立刻出现

            }

            //if (!mainModel.IsRedPointShowPanel())

            //{

            //    CoroutineMgr.Instance.OnMainStartCorUp(swicthCdTime);

            //}

        }



        private void RefreshOSCEffect()


 System/MainInterfacePanel/LowSettingTip.cs

@@ -16,10 +16,9 @@
        [SerializeField] Button _SkillBtn;//技能按钮

        [SerializeField] Button _Pet1Btn;//宠物按钮

        [SerializeField] Button _Synthesis1Btn;//合成按钮

                                               // [SerializeField] Button _RealmBtn;//境界



        [SerializeField] Button _Rune1Btn;//符印按钮

        [SerializeField] Button _SetUp1Btn;//设置按钮





        [SerializeField] Button _RankingListBtn;//排行榜按钮

        [SerializeField] Button _Strengthen1Btn;//强化按钮

@@ -29,7 +28,9 @@
        [SerializeField] Button m_TreasureSoulBtn;//觉醒按钮

        [SerializeField] Button m_GodBeastBtn;//神兽按钮

        [SerializeField] Button m_JadeDynastyBtn;//诛仙装备按钮

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }



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



        public void Init()

        {

            _Role1Btn.onClick.AddListener(Role1Button);

@@ -43,7 +44,7 @@
            _SetUp1Btn.onClick.AddListener(SetUp1Btn);

            _RankingListBtn.onClick.AddListener(RankingListButton);

            m_BagualuBtn.AddListener(OnClickBagualuBtn);

            m_TreasureSoulBtn.AddListener(OnClickTreasureSoul);

            m_TreasureSoulBtn.AddListener(OpenTreasure);

            m_GodBeastBtn.AddListener(GodBeastBtn);

            m_JadeDynastyBtn.AddListener(OpenEquip);

        }

@@ -57,7 +58,6 @@
            _Synthesis1Btn.onClick.RemoveAllListeners();

            _Rune1Btn.onClick.RemoveAllListeners();

            _Pet1Btn.onClick.RemoveAllListeners();

            //  _RealmBtn.onClick.RemoveAllListeners();

            _SetUp1Btn.onClick.RemoveAllListeners();

            _RankingListBtn.onClick.RemoveAllListeners();

            m_BagualuBtn.RemoveAllListeners();

@@ -73,7 +73,6 @@
        }

        void OnClickBagualuBtn()

        {

            //DesignDebug.Log("德龙的八卦炉");

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<BlastFurnaceWin>();

        }

@@ -102,12 +101,39 @@
                WindowCenter.Instance.Open<SkillWin>();

            }



            //DesignDebug.Log("技能按钮");

        }

        void OnClickTreasureSoul()



        void OpenTreasure()

        {

            if (!treasureModel.SatisfyEntranceOpen())

            {

                treasureModel.DisplayEntranceLimitHint();

                return;

            }



            WindowCenter.Instance.Close<MainInterfaceWin>();

            if (treasureModel.IsRequireUnlockAnim(TreasureCategory.Human) != 0)

            {

                treasureModel.currentCategory = TreasureCategory.Human;

            }

            else if (treasureModel.IsRequireUnlockAnim(TreasureCategory.Demon) != 0)

            {

                treasureModel.currentCategory = TreasureCategory.Demon;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])

                == RedPointState.Simple)

            {

                treasureModel.currentCategory = TreasureCategory.Human;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Demon - 1])

                == RedPointState.Simple)

            {

                treasureModel.currentCategory = TreasureCategory.Demon;

            }



            WindowCenter.Instance.Open<TreasureSelectWin>();

        }



        private void GodBeastBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();


 System/MainInterfacePanel/MainButtonMisc.cs

@@ -19,7 +19,6 @@
        [SerializeField] Button m_MysticalPurchaseImg;

        [SerializeField] Button m_DungeonAssistImg;

        [SerializeField] RectTransform m_ContainerGotoGrabBoss;

        [SerializeField] RectTransform m_ContainerAdaptiveChat;

        [SerializeField] Button m_GotoFairyGrabBoss;

        [SerializeField] Button m_FlyToFairyGrabBoss;

        [SerializeField] Button m_FriendQuestBtn;

@@ -34,6 +33,7 @@
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }

        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }



        private void Start()

        {

            m_RedBag.SetListener(RedPacketButton);

@@ -45,6 +45,7 @@
            m_FlyToFairyGrabBoss.SetListener(FlyToFairyGrabBoss);

            m_FairyRequestBtn.SetListener(OnFairyRequestClick);

        }



        public void Init()

        {

            friendsModel.askAddFriendEvent = FriendQuestBtn;

@@ -70,12 +71,13 @@
            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;

            fairyModel.UpdateFairyRequestEvent += UpdateFairyRequest;

        }



        public void OnActived()

        {

            RefreshAdaptiveChat();



        }

        public void Unit()



        public void UnInit()

        {

            m_CollectBehaviour.Dispose();

            RedPacketModel.OnRedBagGetEvent -= OnRedBagGet;

@@ -207,6 +209,7 @@
                WindowCenter.Instance.Open<OpenServerActivityWin>(false, 2);

            }

        }



        void OnArriveCollectNPC(uint sid, int npcID)

        {

            m_CollectBehaviour.gameObject.SetActive(true);

@@ -218,48 +221,56 @@
            m_CollectBehaviour.Dispose();

            m_CollectBehaviour.gameObject.SetActive(false);

        }



        private void ClickWishAward()

        {

            WindowCenter.Instance.Open<WishingGetItemWin>();

        }



        private void UpdateWishAwardImag()

        {

            m_WishingAwardImg.gameObject.SetActive(wishModel.wishingAwardDict.Count > 0 ? true : false);

        }



        private void ClickMysticalPurchase()

        {

            WindowCenter.Instance.Open<OpenServerActivityWin>(false, (int)OpenServerActivityCenter.OSActivityType.MysticalPurchase);

        }



        private void UpdateMysticalPurchaseImag()

        {

            m_MysticalPurchaseImg.gameObject.SetActive(purchaseModel.priorityOpen);

        }



        private void ClickDungeonAssist()

        {

            WindowCenter.Instance.Open<DungeonAssistWin>();

        }



        private void UpdateDungeonAssistImag()

        {

            m_DungeonAssistImg.gameObject.SetActive(assistModel.IsNewAssistInfo);

        }



        private void ShowFairyGrabBoss()

        {

            m_ContainerGotoGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&

                !fairyGrabBossModel.grabBossHintOpen);

        }



        private void bossGrabHintEvent()

        {

            ShowFairyGrabBoss();

        }



        private void RefreshAdaptiveChat()

        {

            if (ChatTip.Inst == null)

            {

                return;

            }

            m_ContainerAdaptiveChat.sizeDelta = m_ContainerAdaptiveChat.sizeDelta.SetY(

                ChatTip.Inst.IsChatUp ? ChatTip.Inst.chatHighSize.y : ChatTip.Inst.chatLowSize.y);

        }



        private void GotoFairyGrabBoss()

        {

            if (fairyGrabBossModel.cacheGotoBossId != 0)


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -86,7 +86,6 @@
            recordPositionBool = true;

            TaskSwithBool = true;

            m_MainPositionTween.SetTaskPos(true);

            m_MainPositionTween.SetFunctionForecastPos(true);

            m_MailObj.SetActive(true);       

            ListBossMapId.Clear();

            string strBoss = FuncConfigConfig.Get("TaskRetract").Numerical1;

@@ -250,7 +249,7 @@
            m_TeamInvitationEntrance.UnInit();

            m_FairyCallBehaviour.UnInit();

            m_FairyLeagueRemind.UnInit();

            m_MainButtonMisc.Unit();

            m_MainButtonMisc.UnInit();



            PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting;

            FunctionUnlockFlyObject.functionUnLockShowBeginEvent -= UnFlodFunctionArea;

@@ -488,27 +487,20 @@


        void TaskSwithButton()

        {

            var inDungeon = IsDungeon();            
            if (TaskSwithBool)//隐藏

            {

                m_MainPositionTween.SetTaskPosTween(false);

                if (!inDungeon)

                {

                    m_MainPositionTween.SetFunctionForecastPosTween(false);

                }

            }

            else//显示

            {

                m_MainPositionTween.SetTaskPosTween(true);

                if (!inDungeon)

                {

                    m_MainPositionTween.SetFunctionForecastPosTween(true);

                }

            }



            if (onMainModel.IsBossAreaTask)

            {

                onMainModel.IsBossAreaTask = false;

            }



            TaskSwithBool = !TaskSwithBool;

        }



@@ -709,10 +701,6 @@
        {

            bool _chatWinOpen = WindowCenter.Instance.IsOpen<ChatWin>();

            m_ChatTip.gameObject.SetActive(!_chatWinOpen);

            if (!_chatWinOpen)

            {

                m_ChatTip.CheckRealmSfx();

            }

        }



        private void WindowAfterEvent(Window _win)

@@ -820,7 +808,7 @@
                }

                if (Event_Duplicates != null && inDungeon)

                {

                    Event_Duplicates(true, m_MainPositionTween.CopyOfThePanelSpeed);

                    Event_Duplicates(true, m_MainPositionTween.rightTopSwitchTime);

                }

                onMainModel.MainTopPanelShow = true;

                if (_isTween)

@@ -840,7 +828,7 @@
                }

                if (Event_Duplicates != null && inDungeon)

                {

                    Event_Duplicates(false, m_MainPositionTween.CopyOfThePanelSpeed);

                    Event_Duplicates(false, m_MainPositionTween.rightTopSwitchTime);

                }

                onMainModel.MainTopPanelShow = false;

                if (_isTween)


 System/MainInterfacePanel/MainPositionTween.cs

@@ -12,210 +12,191 @@

    public class MainPositionTween : MonoBehaviour

    {

        [Header("主界面顶部上下切换模块")]

        public float CopyOfThePanelSpeed = 1f;//副本面板移动速度
        [SerializeField] Transform m_CopyOfThePanel;
        [SerializeField] Transform m_CopyOfThePosition1;

        [SerializeField] Transform m_CopyOfThePosition2;

        [SerializeField] Transform m_ContainerBossList;

        [Header("主界面技能面板切换模块")]

        public float SwitchSkillTipAndButtonTipSpeed = 1.2f;//技能面板和按钮面板的移动速度

        [SerializeField] Transform m_CastSkillTip;//技能面板

        [SerializeField] Transform m_position1_S;

        [SerializeField] Transform m_position2_S;

        [SerializeField] AnimationFadeOut m_AnimationFadeOut;//右下角按钮组

        [Header("主界面任务模块")]

        public float TaskSpeed = 0.2f;//任务面板移动的速度

        [SerializeField] Transform m_TaskAndTeamPanel;

        [SerializeField] Transform m_TaskListTipAnchor1;

        [SerializeField] Transform m_TaskListTipAnchor2;

        [SerializeField] GameObject m_LeftImage;

        [SerializeField] GameObject m_RightImg;

        [Header("功能预告模块")]

        [SerializeField] Transform m_FunctionForecastPanel;

        [SerializeField] Transform m_unctionForecastPosition1;

        [SerializeField] Transform m_unctionForecastPosition2;

        [Header("切换按钮旋转")]

        public Vector3 Vec3 = new Vector3(0f, 0f, 225f);//切换旋转的角度

        [SerializeField] Transform m_ImageRotation;//切换滚动

        public bool IsSetCopyOfThePanelShow

        {

            get

            {

                return (m_CopyOfThePanel.position - m_CopyOfThePosition1.position).sqrMagnitude < (2.5 * 2.5);



        [Header("主界面顶部上下切换模块")]

        public float rightTopSwitchTime = 1f;
        [SerializeField] Transform m_RightTopFunction;
        [SerializeField] Transform m_ContainerBossList;

        [SerializeField] Transform m_RightTopPosition1;

        [SerializeField] Transform m_RightTopPosition2;



        [Header("主界面技能面板切换模块")]

        public float rightBottomSwitchTime = 1.2f;

        [SerializeField] Transform m_ContainerSkill;//技能面板

        [SerializeField] Transform m_SkillPosition1;

        [SerializeField] Transform m_SkillPosition2;

        [SerializeField] AnimationFadeOut m_AnimationFadeOut;//右下角按钮组



        [Header("主界面任务模块")]

        public float leftMiddleSwitchTime = 0.5f;//任务面板移动的速度

        [SerializeField] Transform m_ContainerLeftMiddle;

        [SerializeField] Transform m_LeftMiddlePosition1;

        [SerializeField] Transform m_LeftMiddlePosition2;

        [SerializeField] GameObject m_LeftImage;

        [SerializeField] GameObject m_RightImg;



        public bool IsSetCopyOfThePanelShow {

            get {

                return (m_RightTopFunction.localPosition - m_RightTopPosition1.localPosition).sqrMagnitude < (2.5 * 2.5);

            }

        }

        public void SetCopyOfThePanelPos(bool _bool)



        void SetRightTopWidgetPosition(bool _bool)

        {

            if (_bool)

            {

                m_CopyOfThePanel.localPosition = m_CopyOfThePosition1.localPosition;

                m_RightTopFunction.localPosition = m_RightTopPosition1.localPosition;

            }

            else

            {

                m_CopyOfThePanel.localPosition = m_CopyOfThePosition2.localPosition;

                m_RightTopFunction.localPosition = m_RightTopPosition2.localPosition;

            }

        }
        public void SetCopyOfThePanelTweenPos(bool _bool)

        }



        void SetRightTopWidgetPositionTween(bool _bool)

        {

            if (_bool)

            {

                m_CopyOfThePanel.DOLocalMoveY(m_CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);

                m_RightTopFunction.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);

            }

            else

            {

                m_CopyOfThePanel.DOLocalMoveY(m_CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);

                m_RightTopFunction.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);

            }

        }

        public void SetBossListPos(bool _bool)



        void SetBossListPos(bool _bool)

        {

            if (_bool)

            {

                m_ContainerBossList.localPosition = m_CopyOfThePosition1.localPosition;

                m_ContainerBossList.localPosition = m_RightTopPosition1.localPosition;

            }

            else

            {

                m_ContainerBossList.localPosition = m_CopyOfThePosition2.localPosition;

                m_ContainerBossList.localPosition = m_RightTopPosition2.localPosition;

            }

        }

        public void SetBossListTweenPos(bool _bool)



        void SetBossListTweenPos(bool _bool)

        {

            if (_bool)

            {

                m_ContainerBossList.DOLocalMoveY(m_CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);

                m_ContainerBossList.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);

            }

            else

            {

                m_ContainerBossList.DOLocalMoveY(m_CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);

                m_ContainerBossList.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);

            }

        }



        public void SetTipAndBossPos(bool _bool)

        {

            if (_bool)

            {

                SetCopyOfThePanelPos(true);

                SetRightTopWidgetPosition(true);

                SetBossListPos(false);

            }

            else

            {

                SetCopyOfThePanelPos(false);

                SetRightTopWidgetPosition(false);

                SetBossListPos(true);

            }

        }

        public void SetTipAndBossTweenPos(bool _bool)

        {

            if (_bool)

            {

                SetCopyOfThePanelTweenPos(true);

                SetRightTopWidgetPositionTween(true);

                SetBossListTweenPos(false);

            }

            else

            {

                SetCopyOfThePanelTweenPos(false);

                SetRightTopWidgetPositionTween(false);

                SetBossListTweenPos(true);

            }

        }

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

        public bool IsRightTipPanelShow

        {

            get

            {

                return (m_CastSkillTip.position - m_position1_S.position).sqrMagnitude < 1;



        public bool IsRightTipPanelShow {

            get {

                return (m_ContainerSkill.localPosition - m_SkillPosition1.localPosition).sqrMagnitude < 1;

            }

        }



        public void SetSkillTipOrRightTipPos(bool _bool)

        {

            if (_bool)

            {

                m_AnimationFadeOut.FadeAtOnce();

                m_CastSkillTip.localPosition = m_position1_S.localPosition;

                m_ContainerSkill.localPosition = m_SkillPosition1.localPosition;

            }

            else

            {

                m_AnimationFadeOut.ImmediatelyAppear();

                m_CastSkillTip.localPosition = m_position2_S.localPosition;

                m_ContainerSkill.localPosition = m_SkillPosition2.localPosition;

            }

        }

        public void SetSkillTipOrRightTipPosTween(bool _bool)

        {

            if (_bool)

            {

                m_AnimationFadeOut.FadeOut();

                m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);

                m_ContainerSkill.DOLocalMoveX(m_SkillPosition1.localPosition.x, rightBottomSwitchTime);

            }

            else

            {

                m_AnimationFadeOut.FadeIn();

                m_CastSkillTip.DOLocalMoveX(m_position2_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);

                m_ContainerSkill.DOLocalMoveX(m_SkillPosition2.localPosition.x, rightBottomSwitchTime);

            }

        }

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

        public bool IsTaskAndPanelShow

        {

            get

            {

                return (m_TaskAndTeamPanel.localPosition - m_TaskListTipAnchor1.localPosition).sqrMagnitude < 3*3;



        public bool IsTaskAndPanelShow {

            get {

                return (m_ContainerLeftMiddle.localPosition - m_LeftMiddlePosition1.localPosition).sqrMagnitude < 3 * 3;

            }

        }



        public void SetTaskPos(bool _bool)

        {

            if (_bool)

            {

                m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor1.localPosition;

                m_ContainerLeftMiddle.localPosition = m_LeftMiddlePosition1.localPosition;

            }

            else

            {

                m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor2.localPosition;

                m_ContainerLeftMiddle.localPosition = m_LeftMiddlePosition2.localPosition;

            }

        }

        public void SetTaskPosTween(bool _bool)

        {

            if (_bool)

            {

                m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor1.localPosition.x, TaskSpeed);

                m_ContainerLeftMiddle.DOLocalMoveX(m_LeftMiddlePosition1.localPosition.x, leftMiddleSwitchTime);

                m_LeftImage.SetActive(true);

                m_RightImg.SetActive(false);

            }

            else

            {

                m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor2.localPosition.x, TaskSpeed);

                m_ContainerLeftMiddle.DOLocalMoveX(m_LeftMiddlePosition2.localPosition.x, leftMiddleSwitchTime);

                m_LeftImage.SetActive(false);

                m_RightImg.SetActive(true);

            }

        }

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

        public void SetFunctionForecastPos(bool _bool)

        {

            if (_bool)

            {

                m_FunctionForecastPanel.localPosition = m_unctionForecastPosition1.localPosition;

            }

            else

            {

                m_FunctionForecastPanel.localPosition = m_unctionForecastPosition2.localPosition;

            }

        }
        public void SetFunctionForecastPosTween(bool _bool)

        {

            if (_bool)

            {

                m_FunctionForecastPanel.DOLocalMoveX(m_unctionForecastPosition1.localPosition.x, TaskSpeed);

            }

            else

            {

                m_FunctionForecastPanel.DOLocalMoveX(m_unctionForecastPosition2.localPosition.x, TaskSpeed);

            }

        }
        //--------------------------------


        public void SetRotation(bool _bool)

        {

            if (_bool)

            {

                m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);

                m_ImageRotation.DOLocalRotate(Vec3, rightBottomSwitchTime);

            }

            else

            {

                m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);

                m_ImageRotation.DOLocalRotate(Vector3.zero, rightBottomSwitchTime);

            }

        }
    }

 System/MainInterfacePanel/TaskListTip.cs

@@ -22,60 +22,21 @@
        public float ParentPosition = 74;

        public float TaskScrollViewTaskScrollView = 230f;

        public float m_SizeHeight = 72f;//单条任务的宽度

        [SerializeField] Transform Parent;//父级



        [SerializeField] TreasureCollectBriefInfoBehaviour m_HumanTreasure;//人族法宝

        [SerializeField] Transform TaskScrollView;//任务条位置

        [SerializeField] Transform Content;//任务条父节点

        [SerializeField] ScrollRect m_ScrollRect;



        public int TaskId = 0;//任务ID

        List<int> _list = new List<int>();//用来控制进行排序

        TreasureModel m_Model;

        TreasureModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TreasureModel>()); } }

        TaskModel m_TaskModel;

        TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }

        PackModel _playerPack;

        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }

        PlayerMainDate m_MainModel;

        PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }

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

        TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }



        List<int> ListSort = new List<int>();//用于排列顺序(未卡级)

        List<int> ListSort1 = new List<int>();//用于排序（卡级）

        private void Start()

        {





        }



        void DisplayTreasure(int _treasureIdHuman)

        {

            if (FuncOpen.Instance.IsFuncOpen(106) && model.newGotTreasureId != TreasureModel.TREASURE_GUIDE_ID)

            {

                m_HumanTreasure.gameObject.SetActive(true);

                m_HumanTreasure.Display();

            }

            else

            {

                m_HumanTreasure.gameObject.SetActive(false);

                m_HumanTreasure.Dispose();

            }

        }



        void UpdateControllerPosition()//更新控件位置

        {

            if (m_HumanTreasure.gameObject.activeSelf)

            {

                (Parent as RectTransform).sizeDelta = (Parent as RectTransform).sizeDelta.SetY(ParentPosition);

                (TaskScrollView as RectTransform).sizeDelta = (TaskScrollView as RectTransform).sizeDelta.SetY(TaskScrollViewTaskScrollView - ParentPosition);

            }

            else

            {

                (Parent as RectTransform).sizeDelta = (Parent as RectTransform).sizeDelta.SetY(0);

                (TaskScrollView as RectTransform).sizeDelta = (TaskScrollView as RectTransform).sizeDelta.SetY(TaskScrollViewTaskScrollView);

            }

        }



        public void Init()//初始化

        {



            var TaskSortType = FuncConfigConfig.Get("TaskSortType");

            var RenzhuTaskID = FuncConfigConfig.Get("RenzhuTaskID");

            if (ListSort.Count <= 0)

@@ -94,11 +55,11 @@
                    ListSort1.Add(TaskSortType2[i]);

                }

            }



            TaskModel.Event_TaskToAdd += TaskToAdd;//任务的添加

            TaskModel.Event_TaskRefreshes += TaskRefreshes;//任务的刷新

            TaskModel.Event_TaskToDelete += OnTaskToDelete;//任务的删除

            TaskModel.Event_TaskInformation += TaskInformation;//任务字典信息

            TaskModel.MainCardLevelChange += MainCardLevelChange;//卡级任务修改

            TaskModel.CardLevelChange += CardLevelChangeEvent;//卡级任务状态改变

            model.collectingTreasureChangeEvent += OnCollectingTreasureChangeEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

@@ -115,7 +76,25 @@
        private void CloseTreasureNewGotWinEvent()

        {

            DisplayTreasure(model.collectingHuman);

            UpdateControllerPosition();

        }



        private void OnCollectingTreasureChangeEvent(TreasureCategory _category)

        {

            DisplayTreasure(model.collectingHuman);

        }



        void DisplayTreasure(int _treasureIdHuman)

        {

            if (model.newGotTreasureId != TreasureModel.TREASURE_GUIDE_ID)

            {

                m_HumanTreasure.gameObject.SetActive(true);

                m_HumanTreasure.Display();

            }

            else

            {

                m_HumanTreasure.gameObject.SetActive(false);

                m_HumanTreasure.Dispose();

            }

        }



        private void OnFuncStateChangeEvent(int obj)

@@ -132,11 +111,10 @@
            TaskModel.Event_TaskToDelete -= OnTaskToDelete;//任务的删除

            TaskModel.Event_TaskInformation -= TaskInformation;//任务字典信息

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;

            TaskModel.MainCardLevelChange -= MainCardLevelChange;//卡级任务修改

            TaskModel.CardLevelChange -= CardLevelChangeEvent;//卡级任务状态改变

            TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;

            PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting;//数据的刷新(h0418)

            StopAllCoroutines(); 
            StopAllCoroutines();

        }



        private void Updatefighting(PlayerDataType obj)//等级刷新

@@ -151,8 +129,8 @@
                        int leng = Content.childCount;

                        for (int i = 0; i < leng; i++)

                        {

                            GameObject childObj = Content.GetChild(i).gameObject;

                            TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                            var childObj = Content.GetChild(i).gameObject;

                            var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                            if (childObj.activeSelf && childObjTaskType.TaskID == key)

                            {

                                childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(key);

@@ -162,6 +140,7 @@
                }

            }

        }



        private void CardLevelChangeEvent(int taskID)//卡级状态改变

        {

            if (taskmodel.allMissionDict.ContainsKey(taskID) && taskmodel.allMissionDict[taskID].Type == 3)

@@ -170,12 +149,6 @@
                ChangeSort();

                TaskJump(taskID);

            }

        }

        private void MainCardLevelChange(int _id)//主线任务卡级状态改变

        {

            //TaskScheduling();

            //ChangeSort();

            //TaskJump(_id);

        }



        private void SetLength()

@@ -195,8 +168,8 @@
            int leng = Content.childCount;

            for (int i = 0; i < leng; i++)

            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                var childObj = Content.GetChild(i).gameObject;

                var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                childObjTaskType.ClearTaskName();

                if (childObj.activeSelf)

                {

@@ -219,16 +192,15 @@
                childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]);

            }

        }



        void TaskToAdd(int MissionID, int MissionState, int DiscriptionIndex)//添加任务

        {

            if (MissionID == 2000 || MissionID == 3000 || MissionState == 3 || MissionState == 0)

            {

                return;

            }

            if (Parent.gameObject.activeInHierarchy)

            {

                StartCoroutine(WaitAddTask(MissionID, MissionState));

            }       


            StartCoroutine(WaitAddTask(MissionID, MissionState));

        }



        IEnumerator WaitAddTask(int MissionID, int MissionState)

@@ -244,19 +216,20 @@
                    TaskAddAndDelete(MissionID);

                    if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing)

                    {

                        yield break ;

                        yield break;

                    }

                    TaskJump(MissionID);

                    yield break;

                }

            }

        }



        private void TaskAddAndDelete(int TaskID)

        {

            for (int i = 0; i < Content.childCount; i++)

            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                var childObj = Content.GetChild(i).gameObject;

                var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                if (i < _list.Count)

                {

                    if (!childObj.activeSelf)

@@ -306,8 +279,8 @@
            {

                if (i <= Content.childCount - 1)

                {

                    GameObject childObj = Content.GetChild(i).gameObject;

                    TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                    var childObj = Content.GetChild(i).gameObject;

                    var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                    if (childObj.activeSelf && childObjTaskType.TaskID == MissionID)

                    {

                        if (childObjTaskType.m_TypeBool)

@@ -345,8 +318,8 @@
        {

            for (int i = 0; i < Content.childCount; i++)

            {

                GameObject obj = Content.GetChild(i).gameObject;

                TaskType taskType = obj.GetComponent<TaskType>();

                var obj = Content.GetChild(i).gameObject;

                var taskType = obj.GetComponent<TaskType>();

                if (obj.activeSelf && taskType.TaskID == taskID)

                {

                    taskType.TaskID = 0;

@@ -357,16 +330,15 @@
                }

            }

        }



        private void ChangeSort()//关于任务变更排序

        {



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

            {



                for (int j = 0; j < Content.childCount; j++)

                {

                    GameObject obj = Content.GetChild(j).gameObject;

                    TaskType taskType = obj.GetComponent<TaskType>();

                    var obj = Content.GetChild(j).gameObject;

                    var taskType = obj.GetComponent<TaskType>();

                    if (taskType.TaskID != 0 && taskType.TaskID == _list[i])

                    {

                        int Inedx = _list.IndexOf(taskType.TaskID);

@@ -382,8 +354,8 @@
            int leng = Content.childCount;

            for (int i = 0; i < leng; i++)

            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                var childObj = Content.GetChild(i).gameObject;

                var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                if (childObj.activeSelf && childObjTaskType.TaskID == _Taskid)

                {

                    childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_Taskid);

@@ -422,18 +394,19 @@
                _list.Sort(Compare1);//卡级排序   

            }

        }



        int Compare(int x, int y)//默认排序(无卡级)

        {

            MissionDetailDates xPack = taskmodel.allMissionDict[x];

            MissionDetailDates yPack = taskmodel.allMissionDict[y];

            bool IsMainTaskx = xPack.Type == 0;

            bool IsMainTasky = yPack.Type == 0;

            var xPack = taskmodel.allMissionDict[x];

            var yPack = taskmodel.allMissionDict[y];

            var IsMainTaskx = xPack.Type == 0;

            var IsMainTasky = yPack.Type == 0;

            if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//优先主线

            {

                return -IsMainTaskx.CompareTo(IsMainTasky);

            }

            bool IsStateTaskx = xPack.MissionState == 2;

            bool IsStateTasky = yPack.MissionState == 2;

            var IsStateTaskx = xPack.MissionState == 2;

            var IsStateTasky = yPack.MissionState == 2;

            if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//优先可领取

            {

                return -IsStateTaskx.CompareTo(IsStateTasky);

@@ -454,16 +427,16 @@


        int Compare1(int x, int y)//排序有卡级

        {

            MissionDetailDates xPack = taskmodel.allMissionDict[x];

            MissionDetailDates yPack = taskmodel.allMissionDict[y];

            bool IsMainTaskx = xPack.Type == 0;

            bool IsMainTasky = yPack.Type == 0;

            var xPack = taskmodel.allMissionDict[x];

            var yPack = taskmodel.allMissionDict[y];

            var IsMainTaskx = xPack.Type == 0;

            var IsMainTasky = yPack.Type == 0;

            if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//优先主线

            {

                return -IsMainTaskx.CompareTo(IsMainTasky);

            }

            bool IsStateTaskx = xPack.MissionState == 2;

            bool IsStateTasky = yPack.MissionState == 2;

            var IsStateTaskx = xPack.MissionState == 2;

            var IsStateTasky = yPack.MissionState == 2;

            if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//优先可领取

            {

                return -IsStateTaskx.CompareTo(IsStateTasky);

@@ -480,12 +453,6 @@
            }



            return 1;

        }



        private void OnCollectingTreasureChangeEvent(TreasureCategory _category)

        {

            DisplayTreasure(model.collectingHuman);

            UpdateControllerPosition();

        }



        private bool IsDungeon()//判断是否在副本中

@@ -550,7 +517,7 @@
            {

                bool _IsBool = false;

                var taskList = TaskListConfig.Get(taskmodel.GetNowTaskID);

                if (taskList!=null)

                if (taskList != null)

                {

                    _IsBool = true;

                }

@@ -561,7 +528,7 @@
                        if (_IsBool)//主线卡级

                        {

                            var task_List = TaskListConfig.Get(_list[i]);

                            if (task_List==null)

                            if (task_List == null)

                            {

                                taskmodel.GetNowTaskID = _list[i];

                                return;

@@ -571,11 +538,12 @@
                        {

                            taskmodel.GetNowTaskID = _list[i];

                            return;

                        }                  
                    }               
                        }

                    }

                }

            }

        }



    }

}




 System/MainWin/RealmEntranceBehaviour.cs

New file
@@ -0,0 +1,79 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Wednesday, March 27, 2019
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI
{

    public class RealmEntranceBehaviour : MonoBehaviour
    {
        [SerializeField] Button m_OpenRealm;
        [SerializeField] Image m_Realm;

        Window m_Parent;
        Window parent { get { return m_Parent ?? (m_Parent = this.GetComponentInParent<Window>()); } }

        private void Awake()
        {
            WindowCenter.Instance.windowBeforeOpenEvent += OnWindowPreOpen;
            PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefresh;
        }

        private void OnDestroy()
        {
            WindowCenter.Instance.windowBeforeOpenEvent -= OnWindowPreOpen;
            PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefresh;
        }

        private void Start()
        {
            DisplayRealm();
            m_OpenRealm.SetListener(OpenRealmWin);
        }

        private void OnWindowPreOpen(Window _window)
        {
            if (_window != parent)
            {
                return;
            }

            DisplayRealm();
        }

        private void OnPlayerDataRefresh(PlayerDataType type)
        {
            switch (type)
            {
                case PlayerDataType.RealmLevel:
                    DisplayRealm();
                    break;
            }
        }

        private void DisplayRealm()
        {
            var realm = PlayerDatas.Instance.baseData.realmLevel;
            var config = RealmConfig.Get(realm);
            if (config != null)
            {
                m_Realm.SetSprite(config.Img);
            }
        }

        private void OpenRealmWin()
        {
            WindowCenter.Instance.Close<MainInterfaceWin>();
            WindowCenter.Instance.Open<RealmWin>();
        }

    }

}




 System/MainWin/RealmEntranceBehaviour.cs.meta

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

 System/Treasure/TreasureExhibitionBehaviour.cs

@@ -109,7 +109,6 @@
                ShowCollectingTreasure();

                if (treasureId == TreasureModel.TREASURE_GUIDE_ID)

                {



                    NewBieCenter.Instance.StartNewBieGuide(12);

                }

                else if (model.guideTreasures.Contains(treasureId))


 Utility/OperationLogCollect.cs

@@ -20,7 +20,7 @@
            tables["OperatorID"] = VersionConfig.Get().appId;

            tables["RegionName"] = "data";

            tables["EventID"] = 9001.ToString();

            tables["ProductID"] = "snxxz";

            tables["ProductID"] = "xbqy";

            tables["Device"] = SystemInfo.deviceName;

            tables["IP"] = DeviceUtility.GetIp();

            tables["DeviceFlag"] = DeviceUtility.GetDeviceUniquenessIdentify();

@@ -43,7 +43,7 @@
            tables["RegionName"] = "data";

            tables["AccountID"] = SDKUtility.Instance.FreePlatformInfo == null ? "" : SDKUtility.Instance.FreePlatformInfo.account;

            tables["EventID"] = 9001.ToString();

            tables["ProductID"] = "snxxz";

            tables["ProductID"] = "xbqy";

            tables["Device"] = SystemInfo.deviceName;

            tables["IP"] = DeviceUtility.GetIp();

            tables["DeviceFlag"] = string.IsNullOrEmpty(SDKUtility.Instance.Device.uniqueID) ? "other" : SDKUtility.Instance.Device.uniqueID;

@@ -77,7 +77,7 @@
            tables["OperatorID"] = VersionConfig.Get().appId;

            tables["RegionName"] = StringUtility.Contact("s" + ServerListCenter.Instance.currentServer.region_flag);

            tables["EventID"] = 1102.ToString();

            tables["ProductID"] = "snxxz";

            tables["ProductID"] = "xbqy";

            tables["Time"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

            tables["IP"] = DeviceUtility.GetIp();

            tables["AccountID"] = ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account;

@@ -114,7 +114,7 @@
        tables["RegionName"] = "data";

        tables["RegionID"] = ServerListCenter.Instance.currentServer.region_flag.ToString();

        tables["EventID"] = 9002.ToString();

        tables["ProductID"] = "snxxz";

        tables["ProductID"] = "xbqy";

        tables["Time"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

        tables["IP"] = DeviceUtility.GetIp();

        tables["AccountID"] = ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account;

@@ -141,7 +141,7 @@
#if !UNITY_EDITOR

        bool isFairy = chatType == ChatInfoType.Fairy;

        var tables = new Dictionary<string, string>();

        tables["ProductID"] = "snxxz";

        tables["ProductID"] = "xbqy";

        tables["OperatorID"] = VersionConfig.Get().appId;

        tables["OperatorName"] = string.Empty;

        tables["RegionName"] = StringUtility.Contact("s", ServerListCenter.Instance.currentServer.region_flag);