少年修仙传客户端代码仓库
client_Zxw
2018-10-31 3a40ee1acff6579f0d2a08b97d3864b926d6d70a
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
13 ■■■■ 已修改文件
System/Compose/New/ComposeEquipWin.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeSecondTypeCell.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackSendQuestMgr.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeEquipWin.cs
@@ -346,7 +346,7 @@
                bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
                if (isTrailer)
                {
                    MessageWin.Inst.ShowFixedTip(StringUtility.Contact(thirdTypeData.itemCompound.levelNeed, "级开启"));
                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
                    return;
                }
            }
@@ -601,7 +601,7 @@
                int increaseRate = increases[2] / 100;
                increaseRateItem.SetActive(true);
                RefreshGridCellUI(increaseGridCell, false,increaseId,increaseNeedNum);
                increaseText.text = StringUtility.Contact("增加成功率", StringUtility.Contact(increaseRate, "%"));
                increaseText.text = Language.Get("Compose109", StringUtility.Contact(increaseRate, "%"));
                int haveIncreaseNum = playerPack.GetItemCountByID(PackType.rptItem, increaseId);
                ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(increaseId);
                isIncreaseRate = haveIncreaseNum >= increaseNeedNum ? isIncreaseRate : false;
@@ -624,7 +624,7 @@
                       else
                        {
                            isIncreaseRate = false;
                            MessageWin.Inst.ShowFixedTip(StringUtility.Contact("增加成功率需要",increaseNeedNum,itemConfig.ItemName,"数量不足"));
                            MessageWin.Inst.ShowFixedTip(Language.Get("Compose110", increaseNeedNum, itemConfig.ItemName));
                        }
                    }
                    RefreshComposeSuccessRate();
@@ -792,7 +792,8 @@
            
            if(increaseRate > 0)
            {
                successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(successRate / 100, "%","+",increaseRate,"%"));
                string extraAddRate = UIHelper.GetTextColorByItemColor(TextColType.Green,StringUtility.Contact("+", increaseRate, "%"),true);
                successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(successRate / 100, "%", extraAddRate));
            }
            else
            {
System/Compose/New/ComposeSecondTypeCell.cs
@@ -31,7 +31,7 @@
            unlockObj.SetActive(!isTrailer);
            unlockTypeName.text = itemCompound.thirdTypeName;
            lockTypeName.text = itemCompound.thirdTypeName;
            lockLevel.text = StringUtility.Contact(itemCompound.levelNeed,"级");
            lockLevel.text =  StringUtility.Contact(itemCompound.levelNeed,Language.Get("Z1041"));
            UpdateBtnImg(selectThirdType);
            typeBtn.RemoveAllListeners();
            typeBtn.AddListener(ClickTypeBtn);
System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -703,7 +703,7 @@
            }
            int dungeonID = playerPack.GetDungeonIDByDrugID(useItemModel.itemInfo.ItemID);
            if (dungeonID != 0)
            if (dungeonID != 0 && useItemModel.chinItemModel.Type == (int)ItemType.Buff)
            {
                MapConfig tagMapModel = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
                if (tagMapModel.MapFBType == 0)