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

client_linchunjie

2018-11-01 d77152c84fec0a366d9b817a91139792e9d2a788

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

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -191,7 +191,7 @@
        private void OnSwitchAttackMode(E_AttackMode obj)//PK状态切换

        {

            TextSwitch((int)obj);

          


        }

        void PatternButton(GameObject obj)

        {

@@ -212,7 +212,12 @@
                }

                var activityline = 0;

                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

                if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline!=PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且不在活动区域

                if (mapID == 10010)//Boss争夺战第一只boss道士鼠修改为只能是和平模式

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;

                }

                if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline != PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且不在活动区域

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;

@@ -373,7 +378,7 @@
                    {

                        GetLv = PlayerDatas.Instance.baseData.LV;

                        WindowCenter.Instance.Open<UpgradeWin>();

                    }                 
                    }

                    break;

                case PlayerDataRefresh.MaxHP://最大血量的刷新28

                    _maxHp = (int)PlayerDatas.Instance.extersion.MaxHP;


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -353,6 +353,11 @@
                {

                    Event_Duplicates(true, CopyOfThePanelSpeed);

                }

                if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) < 2)

                {

                    CopyOfThePositionBool = true;

                    m_ContainerBossList.localPosition = CopyOfThePosition2.localPosition;

                }

                m_FunctionForecastTip.gameObject.SetActive(true);

            }

            mapId = PlayerDatas.Instance.baseData.MapID;


 System/Strengthening/GodBeastEntry.cs

@@ -19,6 +19,7 @@
        [SerializeField] Button m_GodBeastButton;
        [SerializeField] RedpointBehaviour m_RedPoint;
        [SerializeField] Image m_GodBeastIcon;
        public float Magnification = 1f;
        public Button GodBeastButton

        {

            get { return m_GodBeastButton; }

@@ -36,6 +37,8 @@
            if (DogZConfig != null)

            {

                m_GodBeastIcon.SetSprite(DogZConfig.HeadIcon);

                m_GodBeastIcon.SetNativeSize();

                m_GodBeastIcon.transform.localScale = Vector3.one * Magnification;

            }

            List<ItemModel> itemModel = dogz_model.GetDogzEquips(godBeastNumber);

            if (itemModel != null)


 System/Team/GroupDungeonChallengeProcessor.cs

@@ -102,8 +102,14 @@
            {

                if (_isAutoMatch)

                {

                    var dungeon = new Dungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);

                    dungeonModel.GroupChallenge(dungeon);

                    bool iamCaptainer = ModelCenter.Instance.GetModel<TeamModel>().myTeam.iamCaptainer;

                    if (iamCaptainer)

                    {

                        dungeonModel.RequestChallangeDungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);

                    }

                    
                    //var dungeon = new Dungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);

                    //dungeonModel.GroupChallenge(dungeon);

                }

                else

                {