少年修仙传客户端代码仓库
client_linchunjie
2018-08-22 9f44ddc93b96fe98ff71d8a24408871ae36befbd
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
16 ■■■■■ 已修改文件
System/Dogz/DogzActiveWin.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzItemCell.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzPackWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzActiveWin.cs
@@ -215,18 +215,18 @@
        private void UpdateDogzAssistCnt()
        {
            m_Controller.m_Scorller.RefreshActiveCellViews();
            m_DogzAssistCnt.text = StringUtility.Contact(model.GetAssistDogzCount(), "/", model.DogzAssistDefaultCnt);
            m_DogzAssistCnt.text = Language.Get("TreasurePrivilege_Dogz_1", StringUtility.Contact(model.GetAssistDogzCount(), "/", model.DogzAssistDefaultCnt));
            UpdateDogzBtn();
        }
        private void UpdateDogzBtn()
        {
            m_CallBackBtnTxt.text = model.TryGetAssistDogzState(model.presentSelectDogz) ? "召回" : "助战";
            m_CallBackBtnTxt.text = model.TryGetAssistDogzState(model.presentSelectDogz) ? Language.Get("DogzFunc104") : Language.Get("DogzFunc105");
        }
        private void AddAssist()
        {
            var _itemConfig = Config.Instance.Get<ItemConfig>(model.AddAssistItem);
            ConfirmCancel.ShowItemConfirm(string.Format("消耗{0}X{1}永久增加1个助战神兽", _itemConfig.ItemName, model.GetAssistItemCnt()),
            ConfirmCancel.ShowItemConfirm(Language.Get("DogzFunc102", _itemConfig.ItemName, model.GetAssistItemCnt()),
                model.AddAssistItem, model.GetAssistItemCnt(), () =>
            {
                model.SendBuyAssistCnt();
System/Dogz/DogzItemCell.cs
@@ -15,17 +15,19 @@
        {
            dogzModel.GetDogzItemList();
            ItemModel model = null;
            DebugEx.Log("Display:" + index + "数据长度:" + dogzModel.dogzItemList.Count);
            if(index < dogzModel.dogzItemList.Count)
            {
                model = dogzModel.dogzItemList[index];
            }
            if(model == null)
            {
                itemBaisc.gameObject.SetActive(false);
                strengthLvTxt.gameObject.SetActive(false);
                return;
            }
            DebugEx.Log("model:"+ model.itemId);
            int strenLv = 0;
            if (model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)
            {
System/Dogz/DogzModel.cs
@@ -388,7 +388,7 @@
        {
            if (TryGetAssistDogzState(presentSelectDogz))
            {
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),"当前神兽助战中,卸下装备无法保持助战状态,确定继续?",
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),Language.Get("DogzFunc103"),
                    (bool isOk)=>
                    {
                        if(isOk)
System/Dogz/DogzPackWin.cs
@@ -133,7 +133,7 @@
            }
            else
            {
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),"背包中没有该部位可穿戴的装备",(bool isOk)=>
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("DogzFunc101"), (bool isOk)=>
                {
                    if(isOk)
                    {
@@ -151,7 +151,7 @@
        private void RefreshDogzItemEvent(PackType type, int index, int id)
        {
            if (type != PackType.rptDogzItem || !dogzModel.IsReachSelectCondi(id)) return;
            if (type != PackType.rptDogzItem && type != PackType.rptDogzEquip) return;
            m_PackController.m_Scorller.RefreshActiveCellViews();
        }