| Lua/Gen/SnxxzUIPackModelWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/GeneralConfig/GeneralDefine.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/EquipDevourWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/PackModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Lua/Gen/SnxxzUIPackModelWrap.cs
@@ -1448,11 +1448,6 @@ { Snxxz.UI.PackModel.EquipStarType _type;translator.Get(L, 2, out _type); gen_to_be_invoked.SetStarSelect( _type ); return 0; } @@ -2307,14 +2302,6 @@ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_starType(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.PackModel gen_to_be_invoked = (Snxxz.UI.PackModel)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.starType); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; }
@@ -190,6 +190,7 @@ public static int acutionItemHour { get; private set; } public static int mainWinTopCloseTime { get; private set; } public static List<int> equipDecomposeScreen = new List<int>(); public static void Init() { @@ -757,6 +758,8 @@ equipTrainMustItemId = GetInt("EquipWashMustID"); acutionItemHour = GetInt("AuctionItem"); mainWinTopCloseTime = GetInt("AutomaticSwitch"); equipDecomposeScreen.AddRange(GetIntArray("EquipDecomposeScreen", 2)); } catch (Exception ex) { System/KnapSack/Logic/EquipDevourWin.cs
@@ -18,8 +18,6 @@ [SerializeField] Text equipLvText; [SerializeField] GameObject colorlistObj; [SerializeField] GameObject lvlistObj; [SerializeField] Button starSelectBtn; [SerializeField] GameObject selectStarIcon; [SerializeField] ClickScreenOtherSpace colorSpaceClick; [SerializeField] ClickScreenOtherSpace lvSpaceClick; @@ -32,7 +30,6 @@ [Header("分解装备属性")] [SerializeField] Text decomLvText; [SerializeField] Text decomPreviewLvText; [SerializeField] List<GameObject> decomAttrlist = new List<GameObject>(); [SerializeField] List<Text> decomAttrNamelist = new List<Text>(); [SerializeField] List<Text> decomAttrValuelist = new List<Text>(); @@ -53,7 +50,6 @@ List<ItemModel> devourModellist; bool isOpen = true; int devourCnt = 0; int getMatCycle = 0; protected override void BindController() { @@ -66,7 +62,6 @@ { equipColorSelectBtn.AddListener(ClickColorSelectBtn); equipLvSelectBtn.AddListener(ClickLvSelectBtn); starSelectBtn.AddListener(ClickStarSelectBtn); devourBtn.AddListener(ClickEquipDecomBtn); colorSpaceClick.AddListener(ClickColorSelectBtn); lvSpaceClick.AddListener(ClickLvSelectBtn); @@ -75,7 +70,6 @@ protected override void OnPreOpen() { getMatCycle = int.Parse(FuncConfigConfig.Get("EquipDecomposeAward").Numerical1); devourCnt = 0; isOpen = true; playerPack.selectDevourlist.Clear(); devourModellist = playerPack.GetDevourModellist(); @@ -128,14 +122,6 @@ isOpen = false; RefreshDecomposeAttr(); RefreshDecomPreviewAttr(); if(playerPack.starType != PackModel.EquipStarType.None) { selectStarIcon.SetActive(true); } else { selectStarIcon.SetActive(false); } ItemConfig getMatConfig = ItemConfig.Get(2125); if(getMatConfig != null) { @@ -255,7 +241,6 @@ private void CreateCell() { devourCnt = 0; gridCtrl.Refresh(); int line = sumGridNum / singleLineNum; for(int i = 0; i < line; i++) @@ -288,20 +273,6 @@ { gridCell.SetModel(null); } } } private void ClickStarSelectBtn() { if(playerPack.starType != PackModel.EquipStarType.None) { playerPack.SetStarSelect(PackModel.EquipStarType.None); selectStarIcon.SetActive(false); } else { playerPack.SetStarSelect(PackModel.EquipStarType.One); selectStarIcon.SetActive(true); } }
@@ -108,9 +108,8 @@ itemGUIDDict.Clear(); showDropItem = false; isPlayBetterEquipEffect = false; colorType = EquipColorType.Purple; colorType = EquipColorType.None; lvType = EquipLvType.All; starType = EquipStarType.None; decomposeLv = 1; decomposeExp = 0; decomposeProgress = 0; @@ -1048,7 +1047,6 @@ #region 物品吞噬逻辑处理 public EquipColorType colorType { get; private set; } public EquipLvType lvType { get; private set; } public EquipStarType starType { get; private set; } public event Action<EquipColorType> RefreshColorSelectAct; public event Action<EquipLvType> RefreshLvSelectAct; public event Action<EquipStarType> RefreshStarSelectAct; @@ -1139,23 +1137,12 @@ { if (colorType == EquipColorType.None) { SetColorSelect(EquipColorType.Purple); SetColorSelect(EquipColorType.White); } } if (RefreshLvSelectAct != null) { RefreshLvSelectAct(type); } SendEquipDevourRecordQuest(); EquipDecomRedCtrl(); } public void SetStarSelect(EquipStarType type) { starType = type; if (RefreshStarSelectAct != null) { RefreshStarSelectAct(type); } SendEquipDevourRecordQuest(); EquipDecomRedCtrl(); @@ -1196,7 +1183,7 @@ { if (devourPlacelist.Contains(model.config.EquipPlace)) { if (model.config.ItemColor >= (int)E_ItemColor.Purple) if (GeneralDefine.equipDecomposeScreen.Contains(model.config.ItemColor)) { devourModellist.Add(model); } @@ -1257,13 +1244,14 @@ { canDevourModellist.Add(model); } } } if (RefreshEquipDecomNumAct != null) { RefreshEquipDecomNumAct(); } return canDevourModellist; } @@ -1271,16 +1259,15 @@ { if (devourPlacelist.Contains(model.config.EquipPlace)) { if (model.config.ItemColor >= (int)E_ItemColor.Purple) if (GeneralDefine.equipDecomposeScreen.Contains(model.config.ItemColor)) { PetEatEquipConfig eatEquipConfig = PetEatEquipConfig.GetEquipColorAndEquipClass(model.config.ItemColor, model.config.LV); var eatEquipConfig = PetEatEquipConfig.GetEquipColorAndEquipClass(model.config.ItemColor, model.config.LV); if (eatEquipConfig == null) return false; if (ItemLogicUtility.Instance.IsFightUp(model.itemId, model.score) != 1) { if (model.config.ItemColor <= (int)colorType && model.config.LV <= (int)lvType && model.config.StarLevel <= (int)starType) && model.config.LV <= (int)lvType) { return true; } @@ -1421,11 +1408,12 @@ public void SendEquipDevourRecordQuest() { var record = StringUtility.Contact((int)colorType + 1, (int)lvType + 1, (int)starType + 1); var record = StringUtility.Contact((int)colorType + 1, (int)lvType + 1, 1); var decomSet = new CA32D_tagCMDecomposeSeting(); decomSet.Seting = uint.Parse(record); GameNetSystem.Instance.SendInfo(decomSet); } public int decomposeLv { get; private set; } public int decomposeExp { get; private set; } public int decomposeProgress { get; private set; } @@ -1475,7 +1463,6 @@ string decomSetStr = info.Seting.ToString(); string colorStr = decomSetStr.Substring(0, 1); colorType = (EquipColorType)(int.Parse(colorStr) - 1); starType = (EquipStarType)((int)info.Seting % 10 - 1); string lvStr = decomSetStr.Substring(1, decomSetStr.Length - 2); lvType = (EquipLvType)(int.Parse(lvStr) - 1); } @@ -1548,6 +1535,8 @@ public enum EquipColorType { None = 0, White = 1, Blue = 2, Purple = 3, Orange = 4, Red = 5,
