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

client_Wu Xijin

2018-11-08 1c36e698ce2ca2344cbc440b6bf5f598c70339ce

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

 Core/NetworkPackage/DTCFile/ServerPack/HB9_Team/DTCB912_tagGCTeamMemFuncDataList.cs

@@ -26,17 +26,17 @@
                {

                    if (int.Parse(vNetData.MemFuncDataList[i].MemFuncData) <= main.LayerNumber)

                    {

                        if (int.Parse(vNetData.MemFuncDataList[i].MemFuncData) - main.WaHuangHighestFloor >= 0)

                        {

                            main.LayerNumber = int.Parse(vNetData.MemFuncDataList[i].MemFuncData) - main.WaHuangHighestFloor;

                        }

                        else

                        {

                            main.LayerNumber = 0;

                        }

                      
                        main.LayerNumber = int.Parse(vNetData.MemFuncDataList[i].MemFuncData);             
                    }

                }

                if (main.LayerNumber - main.WaHuangHighestFloor >= 0)

                {

                    main.LayerNumber -= main.WaHuangHighestFloor;

                }

                else

                {

                    main.LayerNumber = 0;

                }

            }



        }


 Fight/GameActor/GA_Guard.cs

@@ -152,6 +152,13 @@
                Object.DestroyImmediate(guardPickupItem);
            }
        }

        if (m_Model)
        {
            m_Model.transform.SetParent(m_Root);
            m_Model.transform.localPosition = Vector3.zero;
            m_Model.transform.localRotation = Quaternion.identity;
        }
    }

    public void InitBase()

 Fight/GameActor/GA_NpcTouchKilled.cs

@@ -34,6 +34,13 @@
        }

        GAStaticDefine.NpcID2ServerInstID[NpcConfig.NPCID] = ServerInstID;

        if (m_Model)
        {
            m_Model.transform.SetParent(m_Root);
            m_Model.transform.localPosition = Vector3.zero;
            m_Model.transform.localRotation = Quaternion.identity;
        }
    }

    protected override void OnUnit()

 System/Dogz/DogzModel.cs

@@ -558,7 +558,7 @@


        public int GetDogzIndexByPlace(int place)

        {

            return (place / 100) - 1;

            return (place % 100) - 1;

        }



        public int GetDogzIDByIndex(int index)


 System/FairyAu/FairyAuTaskWin.cs

@@ -24,7 +24,8 @@
        [SerializeField] Button CloseBtn;//关闭按钮

        [SerializeField] Text Text_FinishRound;//本周完成数

        [SerializeField] RichText ObjectiveText;//任务目标

        [SerializeField] Text RoundText;//任务环数

        [SerializeField] Text RoundText_L;//任务环数

        [SerializeField] Text RoundText_R;//任务环数

        [SerializeField] Transform _Grid;

        [SerializeField] GameObject m_ReceiveImageObj;//领奖倒计时1

        [SerializeField] Text _ReceiveImageText;//领奖倒计时2

@@ -80,7 +81,7 @@
            if (coinTaskTip.IsFairy && GetCylinderNumber == 10 && vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1)

            {

                m_ReceiveImageObj.SetActive(true);

                _ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_1"), Second);

                _ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_2"), Second);

            }

            else

            {

@@ -119,11 +120,11 @@
                timeType += Time.deltaTime;

                if (Second >= timeType)

                {

                    _ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_1"), Second - (int)timeType);

                    _ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_2"), Second - (int)timeType);

                }

                else

                {

                    _ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_1"), 0);

                    _ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_2"), 0);

                }

                if (timeType >= Second && GetCylinderNumber == 10)

                {

@@ -278,8 +279,8 @@
                Btn_Leave.gameObject.SetActive(false);

                int total = TaskAllocation.Instance.FairyAuAllNumber();

                total = Mathf.CeilToInt((float)total / 10);

                RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(total), 10);

               // RoundText.text = "10/10";

                RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(total));

                RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", 10);

                Btn_Finish.gameObject.SetActive(false);

            }

            else

@@ -288,8 +289,8 @@
                Btn_Finish.gameObject.SetActive(true);

                int total = TaskAllocation.Instance.FairyAuAllNumber();

                total = Mathf.CeilToInt((float)total / 10);

                RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(total), (TaskAllocation.Instance.FairyAuNumber() + 1));

               // RoundText.text = (TaskAllocation.Instance.FairyAuNumber() + 1) + "/10";

                RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(total));

                RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", (TaskAllocation.Instance.FairyAuNumber() + 1));

            }

            Text_FinishRound.text = TaskAllocation.Instance.FairyAuAllNumber() + "/70";



@@ -311,8 +312,8 @@
        {

            Btn_Finish.gameObject.SetActive(false);

            Btn_Leave.gameObject.SetActive(true);

            RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(0),0);

           // RoundText.text = "0/10";

            RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(0));

            RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", 0);

            Text_FinishRound.text = "0/70";

            m_Slider.value = 0f;

            string strINfor = taskmodel.SpecialTask[_taskID].InforList;

@@ -331,8 +332,8 @@
            Btn_Receive.interactable = false;

            Btn_Finish.gameObject.SetActive(false);

            Btn_Leave.gameObject.SetActive(false);

            RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(7), 10);

            //RoundText.text = "10/10";

            RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(7));

            RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", 10);

            Text_FinishRound.text = "70/70";

            m_Slider.value = 1f;

            ObjectiveText.text = Language.Get("CompleteTheXianmengMission_Z");

@@ -453,7 +454,7 @@
        }

        private string  SetNumberOfRounds(int num)

        {

            string Str = String.Empty;

            string Str = string.Empty;

            switch (num)

            {

                case 0:


 System/MainInterfacePanel/FeatureNotice2Win.cs

@@ -104,7 +104,8 @@
            Transform Tran = cell.transform;

            GameObject Tran1 = Tran.Find("FeaturesTypeOne").gameObject;

            GameObject Tran2 = Tran.Find("FeaturesTypeTwo").gameObject;

            if (funcId == featureNoticeModel.FunctionForecastIndex)

            var configs = Config.Instance.Get<FunctionForecastConfig>(funcId);

            if (configs.OpenNumber == featureNoticeModel.FunctionForecastIndex)

            {

               

                Tran1.SetActive(false);

@@ -141,7 +142,7 @@
                int openTag = config.FuncId;

                if (!FuncOpen.Instance.IsFuncOpen(openTag))

                {

                    featureNoticeModel.FunctionForecastIndex = config.FuncId;

                    featureNoticeModel.FunctionForecastIndex = config.OpenNumber;

                    return;

                }

            }

@@ -161,7 +162,7 @@
            }

            Index = featureNoticeModel.FunctionList.FindIndex((x) =>

            {

                return x.FuncId == featureNoticeModel.FunctionForecastIndex;

                return x.OpenNumber == featureNoticeModel.FunctionForecastIndex;

            });

            if (Index == -1)

            {


 System/MainInterfacePanel/InGamePushContainer.cs

@@ -26,7 +26,7 @@
        [SerializeField] FirstChargeTrialBehaviour m_FirstChargeTrialBehaviour;

        [SerializeField] FairyGrabBossHelpBehaviour m_FairyGrabBossHelpBehaviour;

        [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour;



        [SerializeField] InSevenDayBehavior m_InSevenDayBehavior;

        WorldBossModel worldBossModel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }

        BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }

        ElderGodAreaModel elderGodAreaModel { get { return ModelCenter.Instance.GetModel<ElderGodAreaModel>(); } }

@@ -48,7 +48,7 @@
        FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }

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

        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }



        InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }

        public void Init()

        {

            CheckBetterEquip();

@@ -64,6 +64,7 @@
            FirstChargeTrialShow();

            CheckFairyGrabBossHelp();

            CheckDogzNotify();

            InSevenDayShow();

            playerPack.RefreshDecomAttrAct += CheckEquipDecompose;

            betterEquipGetModel.showEquipRefreshEvent += CheckBetterEquip;

            realmEquipModel.showEquipRefreshEvent += CheckRealmBetterEquip;

@@ -357,6 +358,18 @@
                SnxxzGame.Instance.StartCoroutine(Co_DeActiveFairyGrabBoss());

            }

        }

        private void InSevenDayShow()

        {

            if (inSevenDayModel.IsMainGo)

            {

                m_InSevenDayBehavior.gameObject.SetActive(true);

                m_InSevenDayBehavior.GetintDay();

            }

            else

            {

                m_InSevenDayBehavior.gameObject.SetActive(false);

            }

        }



        IEnumerator Co_DeActiveFairyGrabBoss()

        {


 System/OpenServerActivity/InSevenDayBehavior.cs

New file
@@ -0,0 +1,110 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Thursday, November 08, 2018
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using System.Collections.Generic;

using TableConfig;



namespace Snxxz.UI {

    public class InSevenDayBehavior:MonoBehaviour {

        [SerializeField] GameObject m_InSevenDayBehavior;
        [SerializeField] Button m_CloseButton;
        [SerializeField] Button m_GoButton;

        [SerializeField] ItemCell m_ItemCell;

        [SerializeField] Text m_ItemNameTxt;

        [SerializeField] Text m_NewItemTxt;

        InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
        private void Start()

        {

            m_CloseButton.AddListener(CloseButton);
            m_GoButton.AddListener(GoButton);

        }

        private void OnEnable()

        {

           // GetintDay();

        }

        private void CloseButton()
        {
            m_InSevenDayBehavior.SetActive(false);

            inSevenDayModel.IsMainGo = false;
        }

        private void GoButton()
        {
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.WelfareFunc3);

            inSevenDayModel.IsMainGo = false;
        }



        public void GetintDay()

        {

            int inDay = 0;

            foreach (var key in inSevenDayModel.RewardForDic.Keys)

            {

                if (inSevenDayModel.RewardForDic[key] == 0)

                {

                    inDay = key;

                }

            }

            m_ItemNameTxt.text = Language.Get("InsevenDay_text", SetNumberOfRounds(inDay));

            if (!inSevenDayModel.InSevenDayDic.ContainsKey(inDay))

            {

                return;

            }

            ImpactRankModel.RankAwardItem RankAwardItem = inSevenDayModel.InSevenDayDic[inDay].RankAwardItem;

            int Job = PlayerDatas.Instance.baseData.Job;

            List<AwardItem> list = RankAwardItem.GetAwardItem(Job);

            if (list.Count > 0)

            {

                AwardItem item = list[0];

                ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind);

                m_ItemCell.Init(cellModel);

            }

            var config = Config.Instance.Get<InSevenDaysConfig>(inDay);

            if (config != null)

            {

                m_NewItemTxt.text = config.RewardName;

            }

           
        }



        private string SetNumberOfRounds(int num)

        {

            string Str = string.Empty;

            switch (num)

            {

                case 0:

                    Str = Language.Get("Num_CHS_1");

                    return Str;

                case 1:

                    Str = Language.Get("Num_CHS_1");

                    return Str;

                case 2:

                    Str = Language.Get("Num_CHS_2");

                    return Str;

                case 3:

                    Str = Language.Get("Num_CHS_3");

                    return Str;

                case 4:

                    Str = Language.Get("Num_CHS_4");

                    return Str;

                case 5:

                    Str = Language.Get("Num_CHS_5");

                    return Str;

                case 6:

                    Str = Language.Get("Num_CHS_6");

                    return Str;

                case 7:

                    Str = Language.Get("Num_CHS_7");

                    return Str;

            }

            return Str;

        }
    }

}




 System/OpenServerActivity/InSevenDayBehavior.cs.meta

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

 System/OpenServerActivity/InSevenDayModel.cs

@@ -26,6 +26,7 @@
    public bool IsOpenSevenDay = false;

    private const int Redpoint_key1 = 20103;//七天登陆红点

    public  Redpoint redPointStre1 = new Redpoint(201, Redpoint_key1);

    public bool IsMainGo = false;//是否显示主界面入口

    public override void Init()

    {

        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;

@@ -42,6 +43,7 @@
    public void OnBeforePlayerDataInitialize()

    {

        IsOpenSevenDay = false;

        IsMainGo = false;

        RewardForDic.Clear();

        RewardForDic.Add(1, -1);

        RewardForDic.Add(2, -1);

@@ -55,7 +57,10 @@


    public void OnPlayerLoginOk()

    {



        if (redPointStre1.state == RedPointState.Simple || redPointStre1.state == RedPointState.GetReward)

        {

            IsMainGo = true;

        }

    }



    public override void UnInit()


 System/OpenServerActivity/InSevenDayWin.cs

@@ -58,17 +58,21 @@
        {
            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;
            InSevenDayModel.AwardMessageUpdate -= AwardMessageUpdate;
            if (inSevenDay.redPointStre1.state == RedPointState.None)

            {

                inSevenDay.IsMainGo = false;

            }
        }

        protected override void OnAfterClose()
        {
        }

        private void AwardMessageUpdate()
        {
            m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

            ContentAssignment();
        }

        protected override void OnAfterClose()
        {
        }
       
        void OnCreateGridLineCell(ScrollerController gridCtrl)//预制体创建
        {
            gridCtrl.Refresh();

 System/OpenServerActivity/WishItemCell.cs

@@ -10,6 +10,7 @@
        [SerializeField] Button noneItemBtn;

        [SerializeField] Text nameText;

        [SerializeField] GameObject bestIconObj;

        [SerializeField] GameObject contain_Name;



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

        WishingPoolModel wishingModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } }

@@ -20,7 +21,7 @@
            noneItemBtn.RemoveAllListeners();

            if (isWishData)

            {

                nameText.gameObject.SetActive(true);

                contain_Name.SetActive(true);

                itemBaisc.gameObject.SetActive(true);

                noneItemObj.gameObject.SetActive(false);

                bestIconObj.SetActive(wellItem.isBest == 0 ? false : true);

@@ -38,9 +39,9 @@
            }

            else

            {

                contain_Name.SetActive(false);

                itemBaisc.gameObject.SetActive(false);

                noneItemObj.gameObject.SetActive(true);

                nameText.gameObject.SetActive(false);

                bestIconObj.SetActive(false);

                noneItemBtn.AddListener(()=>

                {