少年修仙传客户端代码仓库
client_Wu Xijin
2018-08-27 542d75320aeceded4c5c1e6a0e7c9c34a15b7d29
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
51 ■■■■■ 已修改文件
System/Compose/New/ComposeWin.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GodBeastAttributes.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWin.cs
@@ -32,6 +32,8 @@
        [SerializeField]
        private FunctionButton _itemUITitleType;
        [SerializeField]
        private FunctionButton _dogzEquipFunc;
        [SerializeField]
        private FunctionButtonGroup _funcBtnGroup;
        #endregion
@@ -54,12 +56,12 @@
            _godequipUITitleType.onClick.AddListener(OnClickGodEquipCompose);
            _equipUITitleType.onClick.AddListener(OnClickEquipCompose);
            _itemUITitleType.onClick.AddListener(OnClickItemCompose);
            _dogzEquipFunc.AddListener(ClickDogzEquipCompose);
            _prePageBtn.onClick.AddListener(OnClickLeftBtn);
            _nextPageBtn.onClick.AddListener(OnClickRightBtn);
            _closeBtn.onClick.AddListener(OnClickCloseBtn);
        }
        protected override void OnPreOpen()
        {
            ComposeModel.ResetModel();
@@ -141,6 +143,22 @@
            _funcBtnGroup.TriggerLast();
        }
        private void ClickDogzEquipCompose()
        {
            CloseSubWindows();
            if (windowState == WindowState.Opened)
            {
                WindowCenter.Instance.OpenWithoutAnimation<ComposeDogzEquipWin>();
            }
            else
            {
                WindowCenter.Instance.Open<ComposeDogzEquipWin>();
            }
            functionOrder = _dogzEquipFunc.order;
        }
        private void OnClickItemCompose()
        {
            
@@ -218,6 +236,7 @@
            WindowCenter.Instance.CloseImmediately<ComposeEquipWin>();
            WindowCenter.Instance.CloseImmediately<ComposeToolsWin>();
            WindowCenter.Instance.CloseImmediately<ComposeWingsWin>();
            WindowCenter.Instance.CloseImmediately<ComposeDogzEquipWin>();
        }
        public void OnClickCloseBtn()
System/Strengthening/GodBeastAttributes.cs
@@ -92,7 +92,20 @@
        }
        private void OnClickStrengthBtn()
        {
            Dictionary<int, int> DicAb = m_GodBeastSlidingList.Absorption_Dic;
            List<int> List = new List<int>();
            foreach (var key in DicAb.Keys)
            {
                List.Add(key);
            }
            if (m_DoubleToggle.isOn)
            {
                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, List,1);
            }
            else
            {
                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, List, 0);
            }
        }
        private void ChooseToModify(int locationMarker)
        {
@@ -265,7 +278,7 @@
            }
            else
            {
                m_Slider.gameObject.SetActive(true);
                m_Slider.gameObject.SetActive(true);
                if (DogZExp + ToExpTotal >= DogzEquipConfig.upExpTotal)
                {
                    m_Slider.value = 1f;
@@ -279,7 +292,7 @@
                int[] AttTypeTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attType);
                int[] AttValueTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attValue);
                string strColor = string.Format(Language.Get("DogzGreenText"), ToExpTotal);
                m_ExpNum.text = DogZExp +strColor+ "/" + DogzEquipConfig.upExpTotal;
                m_ExpNum.text = DogZExp + strColor + "/" + DogzEquipConfig.upExpTotal;
                if (AttType.Length > 1)
                {
                    m_TextAttributes1.gameObject.SetActive(true);
@@ -290,7 +303,7 @@
                    string StrName2 = Config.Instance.Get<PlayerPropertyConfig>(AttType[1]).Name;
                    m_TextAttributes1.text = StrName1 + ":" + AttValue[0];
                    m_TextAttributes2.text = StrName2 + ":" + AttValue[1];
                    m_TextAttributesAdd1.text = "+" +( AttValueTo[0] - AttValue[0]);
                    m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);
                    m_TextAttributesAdd2.text = "+" + (AttValueTo[1] - AttValue[1]);
                }
                else
@@ -304,6 +317,15 @@
                    m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);
                }
            }
            if (ToExpTotal == 0)
            {
                m_StrengthenBtn.interactable = false;
            }
            else
            {
                m_StrengthenBtn.interactable = true;
            }
        }
        private int ToLv(int ToExpTotal)//获取等到达的熟练度等级