Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-25 08e6fa059769ad8bcd3fc3202040afa6992d221e

Merge branch 'master' into ItemReconstruction

# Conflicts:
#	System/KnapSack/New/BatchWin.cs

 Core/GameEngine/Login/LoginStage.cs

@@ -77,9 +77,12 @@
    {

        base.OnLateUpdate();



        if (Application.isMobilePlatform)

        {

        CheckClientVersion();

        CheckClientAssets();

    }

    }



    float checkClientTimer = 0f;

    private void CheckClientVersion()


 Core/GameEngine/Model/Config/WeekPartyPointConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:           Fish

//    [  Date ]:           Thursday, February 14, 2019

//    [  Date ]:           Monday, February 25, 2019
//--------------------------------------------------------



using System.Collections.Generic;

@@ -17,6 +17,7 @@
    public readonly string ImageType1;

    public readonly string ImageType2;

    public readonly string name;

    public readonly float Zoom;


    public WeekPartyPointConfig()

    {

@@ -35,6 +36,8 @@
            ImageType2 = tables[2];



            name = tables[3];



            float.TryParse(tables[4],out Zoom); 
        }

        catch (Exception ex)

        {


 Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: f723363b44064444fb15fc4cafbaa0d5
timeCreated: 1550121884
timeCreated: 1551060842
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Dungeon/DungeonAssistPlayerWin.cs

@@ -44,7 +44,7 @@


        protected override void OnAfterOpen()

        {

           
            WindowCenter.Instance.Open<MainInterfaceWin>();

        }



        protected override void OnPreClose()


 System/Dungeon/DungeonInspireWin.cs

@@ -103,6 +103,7 @@
        protected override void OnPreClose()

        {

            model.dungeonInspireLvEvent -= DungeonEncourageEvent;

            WindowCenter.Instance.Open<MainInterfaceWin>();

        }



        protected override void OnAfterClose()


 System/Dungeon/TargetBriefInfoWin.cs

@@ -325,7 +325,13 @@


                if (bossInfo.instanceId != 0)

                {

                    var dataMapId = MapUtility.GetDataMapId();

                    if (dataMapId != DemonJarModel.DEMONJAR_MAPID

                        && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP

                        && dataMapId != JadeDynastyTowerModel.DATA_MAPID)

                    {

                    ShowBossLifeBar(bossInfo, true);

                    }

                }

                else

                {

@@ -346,6 +352,11 @@
                }

                else

                {

                    var dataMapId = MapUtility.GetDataMapId();

                    if (dataMapId != DemonJarModel.DEMONJAR_MAPID

                        && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP

                        && dataMapId != JadeDynastyTowerModel.DATA_MAPID)

                    {

                    if (bossInfo.npcId != TargetBriefInfo.bossInfo.npcId)

                    {

                        ShowBossLifeBar(TargetBriefInfo.bossInfo, true);

@@ -355,6 +366,7 @@
                        RefreshBossLifeBar(TargetBriefInfo.bossInfo);

                    }

                }

                }



                bossInfo = TargetBriefInfo.bossInfo;

            }


 System/KnapSack/New/BatchWin.cs

@@ -16,80 +16,45 @@
    public class BatchWin : Window

    {

        #region 成员变量

        private Text _itemName;

        private Slider _splitSlider;

        private Text _number;

        private Button _addBtn;

        private Button _reduceBtn;

        private Button _splitBtn;

        private Button _closeBtn;

        private ItemCell _itemCell;

        private Text m_ItemName;

        private Slider m_SplitSlider;

        private Text m_Number;

        private Button m_AddBtn;

        private Button m_ReduceBtn;

        private Button m_SplitBtn;

        private Button m_CloseBtn;

        private ItemCell m_ItemCell;

        #endregion



        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel

        {

            get

            {

                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());

            }

        }



        PlayerPackModel _playerPack;

        PlayerPackModel playerPack

        {

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

        }



        PlayerBuffDatas _buffModel;

        PlayerBuffDatas Buffmodel

        {

            get

            {

                return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

            }

        }

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

        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

        PlayerBuffDatas Buffmodel { get { return ModelCenter.Instance.GetModel<PlayerBuffDatas>(); } }



        private ItemModel itemModel;

        #region Built-in

        protected override void BindController()

        {

            _itemName = transform.Find("ItemNameText").GetComponent<Text>();

            _number = transform.Find("SplitSlider/Background/Fill/SplitIcon/NumBG/NumText").GetComponent<Text>();

            _splitSlider = transform.Find("SplitSlider").GetComponent<Slider>();

            _addBtn = transform.Find("Addbtn").GetComponent<Button>();

            _splitBtn = transform.Find("Usebtn").GetComponent<Button>();

            _reduceBtn = transform.Find("Reducebtn").GetComponent<Button>();

            _closeBtn = transform.Find("Closebtn").GetComponent<Button>();

            _itemCell = transform.Find("ItemCell").GetComponent<ItemCell>();

            m_ItemName = this.transform.Find("ItemNameText").GetComponent<Text>();

            m_Number = this.transform.Find("SplitSlider/Background/Fill/SplitIcon/NumBG/NumText").GetComponent<Text>();

            m_SplitSlider = this.transform.Find("SplitSlider").GetComponent<Slider>();

            m_AddBtn = this.transform.Find("Addbtn").GetComponent<Button>();

            m_SplitBtn = this.transform.Find("Usebtn").GetComponent<Button>();

            m_ReduceBtn = this.transform.Find("Reducebtn").GetComponent<Button>();

            m_CloseBtn = this.transform.Find("Closebtn").GetComponent<Button>();

            m_ItemCell = this.transform.Find("ItemCell").GetComponent<ItemCell>();

        }



        protected override void AddListeners()

        {

            _splitSlider.onValueChanged.RemoveAllListeners();

            _addBtn.onClick.RemoveAllListeners();

            _reduceBtn.onClick.RemoveAllListeners();

            _splitBtn.onClick.RemoveAllListeners();

            _closeBtn.onClick.RemoveAllListeners();



            _splitSlider.onValueChanged.AddListener(



             delegate

             {

                 OnSplitValueChange();

             }



             );



            _addBtn.onClick.AddListener(OnClickAddBtn);

            _reduceBtn.onClick.AddListener(OnClickReduceBtn);

            _splitBtn.onClick.AddListener(OnClickBatchUseBtn);

            _closeBtn.onClick.AddListener(OnClickCloseBtn);

            m_SplitSlider.SetListener((float value) => { OnSplitValueChange(); });

            m_AddBtn.SetListener(OnClickAddBtn);

            m_ReduceBtn.SetListener(OnClickReduceBtn);

            m_SplitBtn.SetListener(OnClickBatchUseBtn);

            m_CloseBtn.SetListener(OnClickCloseBtn);

        }



        protected override void OnPreOpen()

        {

            //OpenBatchWin(itemInfoModel.CurItemModel);

            OpenBatchWin();

        }



@@ -103,7 +68,7 @@


        protected override void OnAfterClose()

        {



            WindowCenter.Instance.Open<MainInterfaceWin>();

        }

        #endregion



@@ -111,11 +76,14 @@
        {

            itemModel = playerPack.GetItemByGuid(BatchUseModel.Instance.guid);

            if (itemModel == null)

            {

                return;

            }



            InitPanel();

        }



        public void InitPanel()

        void InitPanel()

        {

            ulong maxValue = 0;

            if(BatchUseModel.Instance.maxValue <= 0)

@@ -127,43 +95,43 @@
                maxValue = (ulong)BatchUseModel.Instance.maxValue;

            }

          

            ItemCellModel cellModel = new ItemCellModel(itemModel.itemId, false, (ulong)maxValue, itemModel.isBind, 
            var cellModel = new ItemCellModel(itemModel.itemId, false, (ulong)maxValue, itemModel.isBind,

             itemModel.guid,itemModel.packType, false);

            _itemCell.Init(cellModel);

            _itemCell.countText.text = maxValue.ToString();

            _itemName.text = itemModel.config.ItemName;

            _splitSlider.minValue = 1;

            _splitSlider.maxValue = maxValue;

            m_ItemCell.Init(cellModel);

            m_ItemCell.countText.text = maxValue.ToString();

            m_ItemName.text = itemModel.config.ItemName;

            m_SplitSlider.minValue = 1;

            m_SplitSlider.maxValue = maxValue;

            if(itemModel.config.BatchUse == 1)

            {

                _splitSlider.value = _splitSlider.minValue;

                m_SplitSlider.value = m_SplitSlider.minValue;

            }

            else if(itemModel.config.BatchUse == 2)

            {

                _splitSlider.value = _splitSlider.maxValue;

                m_SplitSlider.value = m_SplitSlider.maxValue;

            }

           

            _number.text = Mathf.Ceil(_splitSlider.value).ToString();

            m_Number.text = Mathf.Ceil(m_SplitSlider.value).ToString();

        }



        public void OnSplitValueChange()

        {

            _number.text = Mathf.Ceil(_splitSlider.value).ToString();

            m_Number.text = Mathf.Ceil(m_SplitSlider.value).ToString();

        }



        public void OnClickAddBtn()

        {

            if (_splitSlider.value < _splitSlider.maxValue)

            if (m_SplitSlider.value < m_SplitSlider.maxValue)

            {

                _splitSlider.value++;

                m_SplitSlider.value++;

            }

        }



        public void OnClickReduceBtn()

        {

            if (_splitSlider.value > _splitSlider.minValue)

            if (m_SplitSlider.value > m_SplitSlider.minValue)

            {

                _splitSlider.value--;

                m_SplitSlider.value--;

            }

        }



@@ -178,7 +146,7 @@
                {

                    if (isOk)

                    {

                        ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

                        ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

                    }

                }

                );

@@ -186,17 +154,17 @@
            }

            else if(itemModel.config.Type == (int)ItemType.Box)

            {

                ModelCenter.Instance.GetModel<BoxGetItemModel>().CheckOpenBoxCondi(itemModel.guid,itemModel.itemId, (ushort)Mathf.Ceil(_splitSlider.value));

                ModelCenter.Instance.GetModel<BoxGetItemModel>().CheckOpenBoxCondi(itemModel.guid, itemModel.itemId, (ushort)Mathf.Ceil(m_SplitSlider.value));

            }

            else

            {

                ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

                ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

            }

         

            OnClickCloseBtn();

        }



        public void OnClickCloseBtn()

        void OnClickCloseBtn()

        {

            Close();

        }


 System/OpenServerActivity/OpenServiceItem.cs

@@ -37,6 +37,8 @@
                    m_ImageShow.SetSprite(weekPartPointConfig.ImageType2);

                }

                m_ImageShow.SetNativeSize();

                var RectTrans = m_ImageShow.transform.GetComponent<RectTransform>();

                RectTrans.localScale = new Vector3(weekPartPointConfig.Zoom, weekPartPointConfig.Zoom, 1);

            }

            int Point = model.GetPoint(day);           

            m_TextPoint.text = Language.Get("OSA_3", item.NeedPoint);