From aa1a163a2e4db22fc51cb825e9a05d1d3a757370 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 04 八月 2025 00:38:56 +0800
Subject: [PATCH] 79 【常规】背包-临时版本
---
Main/System/Main/FuncsBaseWin.cs | 12
Main/System/KnapSack/Logic/composeLineCell.cs.meta | 5
Main/Config/ConfigManager.cs | 117 +-----
Main/Component/UI/Effect/UIEffectPlayer.cs | 2
Main/System/KnapSack/Logic/composeLineCell.cs | 14
Main/System/KnapSack/Logic/ItemLogicUtility.cs | 2
Main/System/KnapSack/Logic/RolePackLineCell.cs.meta | 5
Main/System/GeneralConfig/GeneralDefine.cs | 2
Main/Config/Configs/ItemConfig.cs | 37 +-
Main/System/KnapSack/Logic/SinglePack.cs | 8
Main/System/KnapSack/New/CommonItemBaisc.cs | 253 +++++++++-----
Main/Component/UI/Effect/EffectPlayer.cs | 1
Main/System/KnapSack/New/ItemCell.cs | 10
Main/System/KnapSack/Logic/PackGirdCell.cs | 17 +
Main/Component/UI/Common/GroupButtonEx.cs | 2
Main/System/KnapSack/Logic/RolePackLineCell.cs | 26 +
Main/System/KnapSack/PackManager.cs | 60 +++
Main/Utility/EnumHelper.cs | 1
Main/System/KnapSack/Logic/RolePackWin.cs | 184 ++++++++++
Main/System/HeroUI/HeroBaseWin.cs | 25 -
/dev/null | 185 ----------
Main/Utility/UIHelper.cs | 4
Main/System/KnapSack/Logic/RolePackWin.cs.meta | 5
Main/System/KnapSack/Logic/PackGirdCell.cs.meta | 5
Main/System/Main/MainWin.cs | 18 -
Main/Component/UI/Common/GroupButtonExManager.cs | 8
26 files changed, 520 insertions(+), 488 deletions(-)
diff --git a/Main/Component/UI/Common/GroupButtonEx.cs b/Main/Component/UI/Common/GroupButtonEx.cs
index 4bb76fe..f56f99a 100644
--- a/Main/Component/UI/Common/GroupButtonEx.cs
+++ b/Main/Component/UI/Common/GroupButtonEx.cs
@@ -103,7 +103,7 @@
SelectBtn();
}
- // 閫変腑褰撳墠鎸夐挳
+ // 閫変腑褰撳墠鎸夐挳锛屽彧澶勭悊鍒锋柊鏄剧ず
public void SelectBtn(bool forceRefresh = false)
{
if (m_State == TitleBtnState.Click && !forceRefresh)
diff --git a/Main/Component/UI/Common/GroupButtonExManager.cs b/Main/Component/UI/Common/GroupButtonExManager.cs
index ab706eb..176a92b 100644
--- a/Main/Component/UI/Common/GroupButtonExManager.cs
+++ b/Main/Component/UI/Common/GroupButtonExManager.cs
@@ -17,8 +17,8 @@
{
// 鎸夐挳缁勫垪琛�
private List<GroupButtonEx> m_Buttons = new List<GroupButtonEx>();
-
- [SerializeField] Color m_SelectedTextColor = Color.white; // 閫変腑鐘舵�佹枃瀛楅鑹�
+
+ [SerializeField] Color m_SelectedTextColor = UIHelper.GetUIColor(TextColType.titleSelectColor); // 閫変腑鐘舵�佹枃瀛楅鑹�
public Color selectedTextColor {
get { return m_SelectedTextColor; }
set {
@@ -26,7 +26,7 @@
}
}
- [SerializeField] Color m_NormalTextColor = new Color(0.7f, 0.7f, 0.7f); // 鏈�変腑鐘舵�佹枃瀛楅鑹�
+ [SerializeField] Color m_NormalTextColor = UIHelper.GetUIColor(TextColType.titleUnSelectColor); // 鏈�変腑鐘舵�佹枃瀛楅鑹�
public Color normalTextColor {
get { return m_NormalTextColor; }
set {
@@ -133,7 +133,7 @@
/// </summary>
private void UpdateAllButtonsState()
{
- SortBtns();
+ // SortBtns();
foreach (var btn in m_Buttons)
{
diff --git a/Main/Component/UI/Common/ItemBaseEffect.cs b/Main/Component/UI/Common/ItemBaseEffect.cs
deleted file mode 100644
index d7866fd..0000000
--- a/Main/Component/UI/Common/ItemBaseEffect.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-public class ItemBaseEffect : MonoBehaviour
-{
- [SerializeField] UIEffectPlayer m_SuitEffect;
-
- int itemId = 0;
-
- private void OnEnable()
- {
- Display(itemId);
- }
-
- public void Display(int itemId, bool dirty = false)
- {
- this.itemId = itemId;
- var curItem = ItemConfig.Get(this.itemId);
- bool isPlay = true;
- if (curItem == null)
- {
- isPlay = false;
- return;
- }
-
- int effectId = 0;
- switch (curItem.ItemColor)
- {
- case 4:
- effectId = 7119;
- break;
- case 5:
- effectId = 7120;
- break;
- case 6:
- case 7:
- case 8:
- effectId = 7121;
- break;
- }
-
- if (curItem.BaseEffectID != 0)
- {
- effectId = curItem.BaseEffectID;
- }
-
- if (m_SuitEffect.effectId != effectId)
- {
- //鍚屼竴涓綅缃浛鎹㈢壒鏁堥渶瑕佸厛閲婃斁
- m_SuitEffect.Stop();
- }
- m_SuitEffect.effectId = effectId;
-
- if (m_SuitEffect.effectId == 0)
- {
- isPlay = false;
- }
- if (isPlay)
- {
- m_SuitEffect.SetActive(true);
- }
- else
- {
- m_SuitEffect.SetActive(false);
- }
- }
-
- public static ItemBaseEffect Create(RectTransform transform)
- {
- var go = UIUtility.CreateWidget("ItemBaseEffect", "ItemBaseEffect");
- var behaviour = go.GetComponent<ItemBaseEffect>();
-
- var scale = 1f;
- var itemBasic = transform.GetComponentInParent<CommonItemBaisc>();
- if (itemBasic == null)
- itemBasic = transform.GetComponentInParent<ItemCell>();
- if (itemBasic != null)
- {
- scale = GetEffectScale(itemBasic.format);
- }
- else
- {
- var itemBehaviour = transform.GetComponentInParent<ItemBehaviour>();
- if (itemBehaviour != null)
- {
- if (itemBehaviour.backGround != null)
- {
- var size = itemBehaviour.backGround.rectTransform.rect.width;
- scale = size / 84;
- }
- }
-
- }
-
- var rect = go.transform as RectTransform;
- go.transform.SetParentEx(transform, Vector3.zero, Quaternion.identity, Vector3.one);
- rect.MatchWhith(transform);
- go.transform.localScale = Vector3.one * scale;
- go.transform.SetAsLastSibling();
-
- return behaviour;
- }
-
-
- static float GetEffectScale(ItemCellformat format)
- {
- switch (format)
- {
- case ItemCellformat.Format_120x120:
- return 1.2f;
- case ItemCellformat.Format_100x100:
- return 1.1f;
- case ItemCellformat.Format_84x84:
- return 1f;
- case ItemCellformat.Format_80x80:
- return 0.95f;
- case ItemCellformat.Format_70x70:
- return 0.83f;
- case ItemCellformat.Format_64x64:
- return 0.76f;
- default:
- return 1f;
- }
- }
-}
diff --git a/Main/Component/UI/Common/ItemBaseEffect.cs.meta b/Main/Component/UI/Common/ItemBaseEffect.cs.meta
deleted file mode 100644
index 423ea25..0000000
--- a/Main/Component/UI/Common/ItemBaseEffect.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: ad12bde7ddfa38e44aa5dc55f1075bc2
-timeCreated: 1603121065
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/Component/UI/Common/ItemBehaviour.cs b/Main/Component/UI/Common/ItemBehaviour.cs
deleted file mode 100644
index 8a1e820..0000000
--- a/Main/Component/UI/Common/ItemBehaviour.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 鐜╀釜娓告垙
-// [ Date ]: Monday, July 31, 2017
-//--------------------------------------------------------
-using UnityEngine;
-using System.Collections;
-using UnityEngine.UI;
-using System;
-
-
-public class ItemBehaviour : MonoBehaviour
-{
-
-
- [SerializeField] ImageEx m_Icon;
- public ImageEx icon { get { return m_Icon; } }
-
- [SerializeField] ImageEx m_BackGround;
- public ImageEx backGround { get { return m_BackGround; } }
-
- [SerializeField] Transform m_CountContainer;
- public Transform countContainer { get { return m_CountContainer; } }
-
- [SerializeField] Text m_Count;
- public Text count { get { return m_Count; } }
-
- [SerializeField] Button m_ViewDetails;
-
- [SerializeField] ItemType m_ItemType = ItemType.Rewards;
-
- //鐗╁搧鍩虹鐗规晥锛堢墿鍝佽〃锛�
- ItemBaseEffect m_ItemBaseEffect;
- ItemBaseEffect itemBaseEffect
- {
- get
- {
- if (m_ItemBaseEffect == null)
- {
- m_ItemBaseEffect = ItemBaseEffect.Create(transform as RectTransform);
- }
- return m_ItemBaseEffect;
- }
- }
-
- bool m_ShowCount = true;
- public bool showCount
- {
- get
- {
- return m_ShowCount;
- }
- set
- {
- if (m_ShowCount != value)
- {
- m_ShowCount = value;
- DisplayCount();
- }
- }
- }
-
- public int itemId
- {
- get; private set;
- }
-
- public int itemCount
- {
- get; private set;
- }
-
- public int itemQuality { get; private set; }
-
- private void Awake()
- {
- if (m_ViewDetails != null)
- {
- m_ViewDetails.SetListener(ViewDetails);
- }
- }
-
- public void SetItem(Item _item)
- {
- SetItem(_item.id, _item.count, _item.quality);
- }
-
- public void SetItem(int _id, int _count, int _quality = 0)
- {
- itemId = _id;
- itemCount = _count;
- itemQuality = _quality;
- DisplayBaseInfo();
- DisplayCount();
- }
-
- public void SetCount(int _count)
- {
- itemCount = _count;
- DisplayCount();
- }
-
- public void DisplayEmpty()
- {
- try
- {
- icon.SetActive(false);
- backGround.SetActive(false);
- if (countContainer != null)
- {
- countContainer.SetActive(false);
- }
- }
- catch (System.Exception ex)
- {
- Debug.Log(ex);
- }
- }
-
- private void DisplayBaseInfo()
- {
- try
- {
- var itemInfo = ItemConfig.Get(itemId);
- if (icon != null)
- {
- icon.SetActive(true);
- icon.SetSprite(itemInfo.IconKey);
- }
-
- if (backGround != null)
- {
- backGround.SetActive(true);
- backGround.SetItemBackGround(itemQuality != 0 ? itemQuality : itemInfo.ItemColor, itemInfo.QualityEchoType);
- }
-
- itemBaseEffect.Display(itemId);
- }
- catch (Exception e)
- {
- Debug.Log(e);
- }
- }
-
- private void DisplayCount()
- {
- if (countContainer == null)
- {
- return;
- }
- switch (m_ItemType)
- {
- case ItemType.Rewards:
- if (showCount && itemCount > 1)
- {
- countContainer.SetActive(true);
- count.text = UIHelper.ReplaceLargeNum((ulong)itemCount);
- }
- else
- {
- countContainer.SetActive(false);
- }
- break;
- case ItemType.Use:
- var _itemCnt = PackManager.Instance.GetItemCountByID(PackType.Item, itemId);
- count.text = StringUtility.Contact(_itemCnt >= itemCount ? "<color=#35e112>" : "<color=#ff0303>", _itemCnt,
- "</color><color=#f7f7f7>/", itemCount, "</color>");
- break;
- }
- }
-
- private void ViewDetails()
- {
- ItemTipUtility.Show(itemId);
- }
-
- public enum ItemType
- {
- Rewards,
- Use,
- }
-}
-
-
-
-
diff --git a/Main/Component/UI/Effect/EffectPlayer.cs b/Main/Component/UI/Effect/EffectPlayer.cs
index 0246021..16010c2 100644
--- a/Main/Component/UI/Effect/EffectPlayer.cs
+++ b/Main/Component/UI/Effect/EffectPlayer.cs
@@ -169,6 +169,7 @@
}
PlayerEffect(true);
+ SoundPlayer.Instance.PlayUIAudio(effectConfig.audio);
}
diff --git a/Main/Component/UI/Effect/UIEffectPlayer.cs b/Main/Component/UI/Effect/UIEffectPlayer.cs
index 03669ac..a8fc647 100644
--- a/Main/Component/UI/Effect/UIEffectPlayer.cs
+++ b/Main/Component/UI/Effect/UIEffectPlayer.cs
@@ -73,7 +73,7 @@
{
PlayerEffect(false);
}
-
+ SoundPlayer.Instance.PlayUIAudio(effectConfig.audio);
}
diff --git a/Main/Config/ConfigManager.cs b/Main/Config/ConfigManager.cs
index b98ef5a..6061df9 100644
--- a/Main/Config/ConfigManager.cs
+++ b/Main/Config/ConfigManager.cs
@@ -38,55 +38,28 @@
// 鍔犺浇閰嶇疆鏂囦欢
HashSet<Type> configTypes = new HashSet<Type>() {
- typeof(ChatBubbleBoxConfig),
+ typeof(ChestsAwardConfig),
typeof(CTGConfig),
- typeof(DailyLivenessRewardConfig),
- typeof(DailyQuestConfig),
- typeof(DailyQuestOpenTimeConfig),
- typeof(DienstgradConfig),
- typeof(DirtyNameConfig),
typeof(DirtyWordConfig),
- typeof(EffectConfig),
typeof(EquipGSParamConfig),
- typeof(EquipPlaceMapConfig),
- typeof(FamilyEmblemConfig),
- typeof(FrameAnimationConfig),
- typeof(FuncConfigConfig),
- typeof(FuncOpenLVConfig),
- typeof(FunctionTeamSetConfig),
- typeof(GetItemWaysConfig),
- typeof(GmCmdConfig),
- typeof(HeroAwakeConfig),
- typeof(HeroConfig),
+ typeof(FaceConfig),
typeof(HeroLineupHaloConfig),
- typeof(HeroQualityAwakeConfig),
- typeof(HeroQualityBreakConfig),
- typeof(HeroQualityConfig),
typeof(HeroQualityLVConfig),
- typeof(HeroSkinConfig),
typeof(ItemConfig),
- typeof(KickOutReasonConfig),
typeof(MainChapterConfig),
typeof(MainLevelConfig),
typeof(NPCConfig),
+ typeof(NPCExConfig),
typeof(NPCLineupConfig),
typeof(OrderInfoConfig),
typeof(PlayerFaceConfig),
- typeof(PlayerLVConfig),
- typeof(PlayerPropertyConfig),
- typeof(priorbundleConfig),
- typeof(RealmConfig),
- typeof(RealmLVUPTaskConfig),
- typeof(RuleConfig),
- typeof(SkillConfig),
- typeof(TaskConfig),
+ typeof(StoreConfig),
+ typeof(SuccessConfig),
+ typeof(SysInfoConfig),
typeof(TitleStarUpConfig),
- typeof(TreasureCntAwardConfig),
- typeof(TreasureItemLibConfig),
typeof(TreasureSetConfig),
typeof(TreeLVConfig),
- typeof(XBGetItemConfig),
- typeof(RichTextMsgReplaceConfig)
+ typeof(XBGetItemConfig)
};
#if UNITY_EDITOR
@@ -236,96 +209,44 @@
public override void Release()
{
- // 娓呯┖ ChatBubbleBoxConfig 瀛楀吀
- ClearConfigDictionary<ChatBubbleBoxConfig>();
+ // 娓呯┖ ChestsAwardConfig 瀛楀吀
+ ClearConfigDictionary<ChestsAwardConfig>();
// 娓呯┖ CTGConfig 瀛楀吀
ClearConfigDictionary<CTGConfig>();
- // 娓呯┖ DailyLivenessRewardConfig 瀛楀吀
- ClearConfigDictionary<DailyLivenessRewardConfig>();
- // 娓呯┖ DailyQuestConfig 瀛楀吀
- ClearConfigDictionary<DailyQuestConfig>();
- // 娓呯┖ DailyQuestOpenTimeConfig 瀛楀吀
- ClearConfigDictionary<DailyQuestOpenTimeConfig>();
- // 娓呯┖ DienstgradConfig 瀛楀吀
- ClearConfigDictionary<DienstgradConfig>();
- // 娓呯┖ DirtyNameConfig 瀛楀吀
- ClearConfigDictionary<DirtyNameConfig>();
// 娓呯┖ DirtyWordConfig 瀛楀吀
ClearConfigDictionary<DirtyWordConfig>();
- // 娓呯┖ EffectConfig 瀛楀吀
- ClearConfigDictionary<EffectConfig>();
// 娓呯┖ EquipGSParamConfig 瀛楀吀
ClearConfigDictionary<EquipGSParamConfig>();
- // 娓呯┖ EquipPlaceMapConfig 瀛楀吀
- ClearConfigDictionary<EquipPlaceMapConfig>();
- // 娓呯┖ FamilyEmblemConfig 瀛楀吀
- ClearConfigDictionary<FamilyEmblemConfig>();
- // 娓呯┖ FrameAnimationConfig 瀛楀吀
- ClearConfigDictionary<FrameAnimationConfig>();
- // 娓呯┖ FuncConfigConfig 瀛楀吀
- ClearConfigDictionary<FuncConfigConfig>();
- // 娓呯┖ FuncOpenLVConfig 瀛楀吀
- ClearConfigDictionary<FuncOpenLVConfig>();
- // 娓呯┖ FunctionTeamSetConfig 瀛楀吀
- ClearConfigDictionary<FunctionTeamSetConfig>();
- // 娓呯┖ GetItemWaysConfig 瀛楀吀
- ClearConfigDictionary<GetItemWaysConfig>();
- // 娓呯┖ GmCmdConfig 瀛楀吀
- ClearConfigDictionary<GmCmdConfig>();
- // 娓呯┖ HeroAwakeConfig 瀛楀吀
- ClearConfigDictionary<HeroAwakeConfig>();
- // 娓呯┖ HeroConfig 瀛楀吀
- ClearConfigDictionary<HeroConfig>();
+ // 娓呯┖ FaceConfig 瀛楀吀
+ ClearConfigDictionary<FaceConfig>();
// 娓呯┖ HeroLineupHaloConfig 瀛楀吀
ClearConfigDictionary<HeroLineupHaloConfig>();
- // 娓呯┖ HeroQualityAwakeConfig 瀛楀吀
- ClearConfigDictionary<HeroQualityAwakeConfig>();
- // 娓呯┖ HeroQualityBreakConfig 瀛楀吀
- ClearConfigDictionary<HeroQualityBreakConfig>();
- // 娓呯┖ HeroQualityConfig 瀛楀吀
- ClearConfigDictionary<HeroQualityConfig>();
// 娓呯┖ HeroQualityLVConfig 瀛楀吀
ClearConfigDictionary<HeroQualityLVConfig>();
- // 娓呯┖ HeroSkinConfig 瀛楀吀
- ClearConfigDictionary<HeroSkinConfig>();
// 娓呯┖ ItemConfig 瀛楀吀
ClearConfigDictionary<ItemConfig>();
- // 娓呯┖ KickOutReasonConfig 瀛楀吀
- ClearConfigDictionary<KickOutReasonConfig>();
// 娓呯┖ MainChapterConfig 瀛楀吀
ClearConfigDictionary<MainChapterConfig>();
// 娓呯┖ MainLevelConfig 瀛楀吀
ClearConfigDictionary<MainLevelConfig>();
// 娓呯┖ NPCConfig 瀛楀吀
ClearConfigDictionary<NPCConfig>();
+ // 娓呯┖ NPCExConfig 瀛楀吀
+ ClearConfigDictionary<NPCExConfig>();
// 娓呯┖ NPCLineupConfig 瀛楀吀
ClearConfigDictionary<NPCLineupConfig>();
// 娓呯┖ OrderInfoConfig 瀛楀吀
ClearConfigDictionary<OrderInfoConfig>();
// 娓呯┖ PlayerFaceConfig 瀛楀吀
ClearConfigDictionary<PlayerFaceConfig>();
- // 娓呯┖ PlayerLVConfig 瀛楀吀
- ClearConfigDictionary<PlayerLVConfig>();
- // 娓呯┖ PlayerPropertyConfig 瀛楀吀
- ClearConfigDictionary<PlayerPropertyConfig>();
- // 娓呯┖ priorbundleConfig 瀛楀吀
- ClearConfigDictionary<priorbundleConfig>();
- // 娓呯┖ RealmConfig 瀛楀吀
- ClearConfigDictionary<RealmConfig>();
- // 娓呯┖ RealmLVUPTaskConfig 瀛楀吀
- ClearConfigDictionary<RealmLVUPTaskConfig>();
- // 娓呯┖ RuleConfig 瀛楀吀
- ClearConfigDictionary<RuleConfig>();
- // 娓呯┖ SkillConfig 瀛楀吀
- ClearConfigDictionary<SkillConfig>();
- // 娓呯┖ TaskConfig 瀛楀吀
- ClearConfigDictionary<TaskConfig>();
+ // 娓呯┖ StoreConfig 瀛楀吀
+ ClearConfigDictionary<StoreConfig>();
+ // 娓呯┖ SuccessConfig 瀛楀吀
+ ClearConfigDictionary<SuccessConfig>();
+ // 娓呯┖ SysInfoConfig 瀛楀吀
+ ClearConfigDictionary<SysInfoConfig>();
// 娓呯┖ TitleStarUpConfig 瀛楀吀
ClearConfigDictionary<TitleStarUpConfig>();
- // 娓呯┖ TreasureCntAwardConfig 瀛楀吀
- ClearConfigDictionary<TreasureCntAwardConfig>();
- // 娓呯┖ TreasureItemLibConfig 瀛楀吀
- ClearConfigDictionary<TreasureItemLibConfig>();
// 娓呯┖ TreasureSetConfig 瀛楀吀
ClearConfigDictionary<TreasureSetConfig>();
// 娓呯┖ TreeLVConfig 瀛楀吀
diff --git a/Main/Config/Configs/ItemConfig.cs b/Main/Config/Configs/ItemConfig.cs
index be83867..a39fdc4 100644
--- a/Main/Config/Configs/ItemConfig.cs
+++ b/Main/Config/Configs/ItemConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2025骞�7鏈�26鏃�
+// [ Date ]: Monday, August 4, 2025
//--------------------------------------------------------
using System.Collections.Generic;
@@ -71,7 +71,6 @@
public int ChangeOrd;
public string Description;
public string QualityName;
- public int QualityEchoType;
public int LimitSTR;
public int LimitPHY;
public int LimitPNE;
@@ -227,31 +226,29 @@
QualityName = tables[59];
- int.TryParse(tables[60],out QualityEchoType);
+ int.TryParse(tables[60],out LimitSTR);
- int.TryParse(tables[61],out LimitSTR);
+ int.TryParse(tables[61],out LimitPHY);
- int.TryParse(tables[62],out LimitPHY);
+ int.TryParse(tables[62],out LimitPNE);
- int.TryParse(tables[63],out LimitPNE);
+ Template = tables[63];
- Template = tables[64];
+ int.TryParse(tables[64],out DropItemPattern);
- int.TryParse(tables[65],out DropItemPattern);
+ int.TryParse(tables[65],out SellTip);
- int.TryParse(tables[66],out SellTip);
+ int.TryParse(tables[66],out BatchUse);
- int.TryParse(tables[67],out BatchUse);
+ int.TryParse(tables[67],out Jump);
- int.TryParse(tables[68],out Jump);
-
- if (tables[69].Contains("["))
+ if (tables[68].Contains("["))
{
- GetWay = JsonMapper.ToObject<int[]>(tables[69]);
+ GetWay = JsonMapper.ToObject<int[]>(tables[68]);
}
else
{
- string[] GetWayStringArray = tables[69].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] GetWayStringArray = tables[68].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
GetWay = new int[GetWayStringArray.Length];
for (int i=0;i<GetWayStringArray.Length;i++)
{
@@ -259,15 +256,15 @@
}
}
- ItemTypeName = tables[70];
+ ItemTypeName = tables[69];
- if (tables[71].Contains("["))
+ if (tables[70].Contains("["))
{
- UseCondiType = JsonMapper.ToObject<int[]>(tables[71]);
+ UseCondiType = JsonMapper.ToObject<int[]>(tables[70]);
}
else
{
- string[] UseCondiTypeStringArray = tables[71].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] UseCondiTypeStringArray = tables[70].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
UseCondiType = new int[UseCondiTypeStringArray.Length];
for (int i=0;i<UseCondiTypeStringArray.Length;i++)
{
@@ -275,7 +272,7 @@
}
}
- int.TryParse(tables[72],out BaseEffectID);
+ int.TryParse(tables[71],out BaseEffectID);
}
catch (Exception exception)
{
diff --git a/Main/System/GeneralConfig/GeneralDefine.cs b/Main/System/GeneralConfig/GeneralDefine.cs
index 7b2c547..302a4e9 100644
--- a/Main/System/GeneralConfig/GeneralDefine.cs
+++ b/Main/System/GeneralConfig/GeneralDefine.cs
@@ -12,7 +12,6 @@
public const int CrossFamilyBattleMapID = 32090;
public static int initDepotGridCount { get; private set; }
public static int maxDepotGridCount { get; private set; }
- public static int initBagGridCount { get; private set; }
public static int maxBagGridCount { get; private set; }
public static int maxXBGridCount { get; private set; }
public static int playerMaxLevel { get; private set; }
@@ -260,7 +259,6 @@
// BlueEquipJumpLevel = GetInt("BlueEquipJumpLevel");
// initDepotGridCount = GetInt("InitDepotCellCount");
// maxDepotGridCount = GetInt("MaxDepotCellCount");
- // initBagGridCount = GetInt("InitBagCellCount");
// maxBagGridCount = GetInt("MaxBagCellCount");
// maxXBGridCount = GetInt("TreasureSet", 3);
diff --git a/Main/System/HeroUI/HeroBaseWin.cs b/Main/System/HeroUI/HeroBaseWin.cs
index 3efbd11..6f4d8a7 100644
--- a/Main/System/HeroUI/HeroBaseWin.cs
+++ b/Main/System/HeroUI/HeroBaseWin.cs
@@ -9,10 +9,6 @@
public class HeroBaseWin : FunctionsBaseWin
{
- [SerializeField] List<Image> funcSelectImgList;
- [SerializeField] List<Image> funcUnSelectImgList;
- [SerializeField] List<Text> titleNameList;
-
/// </summary>
protected override void InitComponent()
{
@@ -23,6 +19,7 @@
protected override void OnPreOpen()
{
base.OnPreOpen();
+ tabButtons[functionOrder].SelectBtn(true);
}
protected override void OnPreClose()
@@ -37,26 +34,6 @@
}
- protected override void UpdateButtonsState()
- {
- for (int i = 0; i < funcSelectImgList.Count; i++)
- {
- if (i == functionOrder)
- {
- funcSelectImgList[i].SetActive(true);
- funcUnSelectImgList[i].SetActive(false);
- titleNameList[i].color = UIHelper.GetUIColor(TextColType.titleSelectColor);
-
- }
- else
- {
- funcSelectImgList[i].SetActive(false);
- funcUnSelectImgList[i].SetActive(true);
- titleNameList[i].color = UIHelper.GetUIColor(TextColType.titleUnSelectColor);
-
- }
- }
- }
protected override void OpenSubUIByTabIndex()
{
diff --git a/Main/System/KnapSack/Logic/ItemLogicUtility.cs b/Main/System/KnapSack/Logic/ItemLogicUtility.cs
index ac55fb5..e43d797 100644
--- a/Main/System/KnapSack/Logic/ItemLogicUtility.cs
+++ b/Main/System/KnapSack/Logic/ItemLogicUtility.cs
@@ -352,7 +352,7 @@
SinglePack singlePack = packModel.GetSinglePack(PackType.Item);
if (singlePack == null) return false;
- int startLockIndex = singlePack.unlockedGridCount - GeneralDefine.initBagGridCount;
+ int startLockIndex = singlePack.unlockedGridCount - PackManager.Instance.initBagGridCount;
FuncConfigConfig _tagFuncModel = FuncConfigConfig.Get("OpenBagItem");
int haveCount = packModel.GetItemCountByID(PackType.Item, itemId);
Equation.Instance.Clear();
diff --git a/Main/System/KnapSack/Logic/PackGirdCell.cs b/Main/System/KnapSack/Logic/PackGirdCell.cs
new file mode 100644
index 0000000..16b5df8
--- /dev/null
+++ b/Main/System/KnapSack/Logic/PackGirdCell.cs
@@ -0,0 +1,17 @@
+锘縰sing UnityEngine;
+
+/// <summary>
+/// 鑳屽寘鏍煎瓙
+/// </summary>
+public class PackGirdCell : MonoBehaviour
+{
+ [SerializeField] ItemCell itemCell;
+ [SerializeField] RedpointBehaviour redPoint; // 姝ゅ绾㈢偣鍙互鐢ㄥ浘鐗囪〃绀�
+ public void Display(int index)
+ {
+ var guid = PackManager.Instance.GetSinglePack(PackType.Item).itemGuidList[index];
+ if (string.IsNullOrEmpty(guid))
+ return;
+ itemCell.Init(PackManager.Instance.GetItemByGuid(guid));
+ }
+}
diff --git a/Main/Component/UI/Common/ItemBehaviour.cs.meta b/Main/System/KnapSack/Logic/PackGirdCell.cs.meta
similarity index 68%
copy from Main/Component/UI/Common/ItemBehaviour.cs.meta
copy to Main/System/KnapSack/Logic/PackGirdCell.cs.meta
index cec07ae..d25b99a 100644
--- a/Main/Component/UI/Common/ItemBehaviour.cs.meta
+++ b/Main/System/KnapSack/Logic/PackGirdCell.cs.meta
@@ -1,8 +1,7 @@
fileFormatVersion: 2
-guid: a11c4ed088f00fb4baea8b08f0cfa42f
-timeCreated: 1501488202
-licenseType: Free
+guid: 3c64a63d0c44fce40a3d1b90b18b2324
MonoImporter:
+ externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
diff --git a/Main/System/KnapSack/Logic/RolePackLineCell.cs b/Main/System/KnapSack/Logic/RolePackLineCell.cs
new file mode 100644
index 0000000..bb860db
--- /dev/null
+++ b/Main/System/KnapSack/Logic/RolePackLineCell.cs
@@ -0,0 +1,26 @@
+锘縰sing UnityEngine;
+
+/// <summary>
+/// 鑳屽寘鏍煎瓙琛�
+/// </summary>
+public class RolePackLineCell : CellView
+{
+ [SerializeField] PackGirdCell[] itemCell;
+ public void Display(int index)
+ {
+ var itemPack = PackManager.Instance.GetSinglePack(PackType.Item);
+ for (int i = 0; i < itemCell.Length; i++)
+ {
+ if (index + i < itemPack.itemGuidList.Count)
+ {
+ itemCell[i].SetActive(true);
+ itemCell[i].Display(index + i);
+ }
+ else
+ {
+ itemCell[i].SetActive(false);
+ }
+ }
+
+ }
+}
diff --git a/Main/Component/UI/Common/ItemBehaviour.cs.meta b/Main/System/KnapSack/Logic/RolePackLineCell.cs.meta
similarity index 68%
rename from Main/Component/UI/Common/ItemBehaviour.cs.meta
rename to Main/System/KnapSack/Logic/RolePackLineCell.cs.meta
index cec07ae..a1191e5 100644
--- a/Main/Component/UI/Common/ItemBehaviour.cs.meta
+++ b/Main/System/KnapSack/Logic/RolePackLineCell.cs.meta
@@ -1,8 +1,7 @@
fileFormatVersion: 2
-guid: a11c4ed088f00fb4baea8b08f0cfa42f
-timeCreated: 1501488202
-licenseType: Free
+guid: b5df92a5e4b691444919db543a27de21
MonoImporter:
+ externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
diff --git a/Main/System/KnapSack/Logic/RolePackWin.cs b/Main/System/KnapSack/Logic/RolePackWin.cs
new file mode 100644
index 0000000..cabf0db
--- /dev/null
+++ b/Main/System/KnapSack/Logic/RolePackWin.cs
@@ -0,0 +1,184 @@
+using System;
+using UnityEngine;
+
+/// <summary>
+/// 鑳屽寘鐣岄潰
+/// </summary>
+public class RolePackWin : UIBase
+{
+
+ [SerializeField] ScrollerController packScroller;
+ [SerializeField] ScrollerController composeScroller;
+ [SerializeField] GroupButtonEx packBtn;
+ [SerializeField] GroupButtonEx composeBtn;
+
+
+ SinglePack itemPack;
+ bool isRefreshPack = false; //鏄惁鍒锋柊鑳屽寘
+ /// </summary>
+ protected override void InitComponent()
+ {
+ packBtn.AddListener(() =>
+ {
+ functionOrder = 0;
+ Refresh();
+ });
+ composeBtn.AddListener(() =>
+ {
+ functionOrder = 1;
+ Refresh();
+ });
+ }
+
+
+ protected override void OnPreOpen()
+ {
+ itemPack = PackManager.Instance.GetSinglePack(PackType.Item);
+ packScroller.OnRefreshCell += RefreshPackCell;
+ composeScroller.OnRefreshCell += RefreshComposeCell;
+ PackManager.Instance.refrechPackEvent += RefrechPackEvent;
+ PackManager.Instance.RefreshItemEvent += RefreshItemEvent;
+
+ if (functionOrder == 0)
+ {
+ packBtn.SelectBtn();
+ }
+ else
+ {
+ composeBtn.SelectBtn();
+ }
+ SortItems();
+ Refresh();
+ }
+
+ protected override void OnPreClose()
+ {
+ packScroller.OnRefreshCell -= RefreshPackCell;
+ composeScroller.OnRefreshCell -= RefreshComposeCell;
+ PackManager.Instance.refrechPackEvent -= RefrechPackEvent;
+ }
+
+ float cdTime = 0f;
+ void LateUpdate()
+ {
+ if (isRefreshPack)
+ {
+ //鍒锋柊cd0.2绉�
+ if (Time.time > cdTime + 0.2f)
+ {
+ SortItems();
+ Refresh();
+ isRefreshPack = false;
+ cdTime = Time.time;
+ }
+
+ }
+ }
+
+ void RefrechPackEvent(PackType type)
+ {
+ if (type != PackType.Item)
+ {
+ return;
+ }
+ //寤惰繜0.2绉掑埛鏂� 璁剧疆 isRefreshPack涓簍rue
+ isRefreshPack = true;
+
+ }
+
+ void RefreshItemEvent(PackType type, int index, int itemID)
+ {
+ if (type != PackType.Item)
+ {
+ return;
+ }
+ isRefreshPack = true;
+ }
+
+
+ public override void Refresh()
+ {
+
+ packScroller.SetActive(functionOrder == 0);
+ composeScroller.SetActive(functionOrder != 0);
+ CreatePackScroller();
+ CreateComposeScroller();
+ }
+
+ void SortItems()
+ {
+ itemPack.itemGuidList.Clear();
+ var itemDict = itemPack.GetAllItems();
+ foreach (var itemID in itemDict.Values)
+ {
+ itemPack.itemGuidList.Add(itemID.guid);
+ }
+ itemPack.itemGuidList.Sort(CmpItem);
+ }
+
+ int CmpItem(string guidA, string guidB)
+ {
+ var itemA = PackManager.Instance.GetItemByGuid(guidA);
+ var itemB = PackManager.Instance.GetItemByGuid(guidB);
+
+ var typeIndexA = Array.IndexOf(PackManager.Instance.itemPackSortTyps, itemA.config.Type);
+ var typeIndexB = Array.IndexOf(PackManager.Instance.itemPackSortTyps, itemB.config.Type);
+ if (typeIndexA != typeIndexB)
+ {
+ return typeIndexA - typeIndexB;
+ }
+
+ var qualityA = itemA.config.ItemColor;
+ var qualityB = itemB.config.ItemColor;
+ if (qualityA != qualityB)
+ {
+ return qualityB - qualityA;
+ }
+
+ var lvA = itemA.config.LV;
+ var lvB = itemB.config.LV;
+ if (lvA != lvB)
+ {
+ return lvB - lvA;
+ }
+
+ var itemIDA = itemA.config.ID;
+ var itemIDB = itemB.config.ID;
+ return itemIDA - itemIDB;
+ }
+
+ void CreatePackScroller()
+ {
+ if (functionOrder != 0)
+ {
+ return;
+ }
+ packScroller.Refresh();
+ for (int i = 0; i < itemPack.itemGuidList.Count; i++)
+ {
+ if (i % 5 == 0)
+ {
+ packScroller.AddCell(ScrollerDataType.Header, i);
+ }
+ }
+ packScroller.Restart();
+ }
+
+ void CreateComposeScroller()
+ {
+ if (functionOrder != 1)
+ {
+ return;
+ }
+ }
+
+ void RefreshPackCell(ScrollerDataType type, CellView cell)
+ {
+ var _cell = cell as RolePackLineCell;
+ _cell.Display(cell.index);
+ }
+
+ void RefreshComposeCell(ScrollerDataType type, CellView cell)
+ {
+ }
+}
\ No newline at end of file
diff --git a/Main/Component/UI/Common/ItemBehaviour.cs.meta b/Main/System/KnapSack/Logic/RolePackWin.cs.meta
similarity index 68%
copy from Main/Component/UI/Common/ItemBehaviour.cs.meta
copy to Main/System/KnapSack/Logic/RolePackWin.cs.meta
index cec07ae..f7f55ff 100644
--- a/Main/Component/UI/Common/ItemBehaviour.cs.meta
+++ b/Main/System/KnapSack/Logic/RolePackWin.cs.meta
@@ -1,8 +1,7 @@
fileFormatVersion: 2
-guid: a11c4ed088f00fb4baea8b08f0cfa42f
-timeCreated: 1501488202
-licenseType: Free
+guid: bbbbfd91a59637f4cb7cee421f98052c
MonoImporter:
+ externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
diff --git a/Main/System/KnapSack/Logic/SinglePack.cs b/Main/System/KnapSack/Logic/SinglePack.cs
index c597917..36f22b3 100644
--- a/Main/System/KnapSack/Logic/SinglePack.cs
+++ b/Main/System/KnapSack/Logic/SinglePack.cs
@@ -1,7 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+锘縰sing System.Collections.Generic;
public class SinglePack
{
@@ -9,6 +6,9 @@
public int unlockedGridCount { get; private set; } //宸插紑鍚儗鍖呮牸瀛愭暟
private Dictionary<int, ItemModel> items = new Dictionary<int, ItemModel>(); //key 鐗╁搧浣嶇疆绱㈠紩
private Dictionary<int, List<int>> itemIDs = new Dictionary<int, List<int>>(); //key 鐗╁搧ID锛氱墿鍝佷綅缃储寮�
+
+ public List<string> itemGuidList = new List<string>(); //鍓嶇鐣岄潰GUID鎺掑簭锛屽悇涓儗鍖呮牴鎹疄闄呮儏鍐典娇鐢�
+
public SinglePack(PackType type)
{
this.type = type;
diff --git a/Main/System/KnapSack/Logic/composeLineCell.cs b/Main/System/KnapSack/Logic/composeLineCell.cs
new file mode 100644
index 0000000..72122ec
--- /dev/null
+++ b/Main/System/KnapSack/Logic/composeLineCell.cs
@@ -0,0 +1,14 @@
+锘縰sing UnityEngine;
+
+/// <summary>
+/// 鍚堟垚鏍煎瓙琛�
+/// </summary>
+public class composeLineCell : CellView
+{
+ [SerializeField] PackGirdCell[] itemCell;
+ public void Display(int index)
+ {
+
+
+ }
+}
diff --git a/Main/Component/UI/Common/ItemBehaviour.cs.meta b/Main/System/KnapSack/Logic/composeLineCell.cs.meta
similarity index 68%
copy from Main/Component/UI/Common/ItemBehaviour.cs.meta
copy to Main/System/KnapSack/Logic/composeLineCell.cs.meta
index cec07ae..0418484 100644
--- a/Main/Component/UI/Common/ItemBehaviour.cs.meta
+++ b/Main/System/KnapSack/Logic/composeLineCell.cs.meta
@@ -1,8 +1,7 @@
fileFormatVersion: 2
-guid: a11c4ed088f00fb4baea8b08f0cfa42f
-timeCreated: 1501488202
-licenseType: Free
+guid: ff43611139197a9479fcc08c18d025f4
MonoImporter:
+ externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
diff --git a/Main/System/KnapSack/New/CommonItemBaisc.cs b/Main/System/KnapSack/New/CommonItemBaisc.cs
index a2bb5ed..6ba1861 100644
--- a/Main/System/KnapSack/New/CommonItemBaisc.cs
+++ b/Main/System/KnapSack/New/CommonItemBaisc.cs
@@ -20,11 +20,12 @@
public ItemCellformat format { get { return m_Format; } set { m_Format = value; } }
Image m_BgIcon;
- private Image bgIcon {
- get {
+ private Image bgIcon
+ {
+ get
+ {
if (m_BgIcon == null)
{
- LoadPrefab();
m_BgIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_BackGround");
}
return m_BgIcon;
@@ -32,11 +33,12 @@
}
Image m_ItemIcon;
- private Image itemIcon {
- get {
+ private Image itemIcon
+ {
+ get
+ {
if (m_ItemIcon == null)
{
- LoadPrefab();
m_ItemIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_Icon");
}
return m_ItemIcon;
@@ -45,11 +47,12 @@
Image m_StateIcon;
- public Image stateIcon {
- get {
+ public Image stateIcon
+ {
+ get
+ {
if (m_StateIcon == null)
{
- LoadPrefab();
m_StateIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_State");
}
return m_StateIcon;
@@ -57,61 +60,99 @@
}
Text m_CountText;
- public Text countText {
- get {
+ public Text countText
+ {
+ get
+ {
if (m_CountText == null)
{
- LoadPrefab();
m_CountText = this.transform.GetComponent<Text>("Container_ItemCell/Txt_Count");
}
return m_CountText;
}
}
+ Image m_CountryIcon;
+ public Image countryIcon
+ {
+ get
+ {
+ if (m_CountryIcon == null)
+ {
+ m_CountryIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_Country");
+ }
+ return m_CountryIcon;
+ }
+ }
+
+ Image m_PieceIcon;
+ public Image pieceIcon
+ {
+ get
+ {
+ if (m_PieceIcon == null)
+ {
+ m_PieceIcon = this.transform.GetComponent<Image>("Container_ItemCell/Img_Piece");
+ }
+ return m_PieceIcon;
+ }
+ }
+
+ Transform m_TimeForm;
+ public Transform timeForm
+ {
+ get
+ {
+ if (m_TimeForm == null)
+ {
+ m_TimeForm = this.transform.Find("Container_ItemCell/Bg_Time");
+ }
+ return m_TimeForm;
+ }
+ }
+
+ Text m_TimeText;
+ public Text timeText
+ {
+ get
+ {
+ if (m_TimeText == null)
+ {
+ m_TimeText = this.transform.GetComponent<Text>("Container_ItemCell/Bg_Time/Txt_Time");
+ }
+ return m_TimeText;
+ }
+ }
+
+
Button m_Button;
- public Button button {
- get {
+ public Button button
+ {
+ get
+ {
if (m_Button == null)
{
- LoadPrefab();
m_Button = this.GetComponent<Button>("Container_ItemCell");
}
return m_Button;
}
}
- // EquipSuitEffect m_SuitEffect;
- // EquipSuitEffect suitEffect {
- // get {
- // if (m_SuitEffect == null)
- // {
- // LoadPrefab();
- // //clone 浼氶�犳垚浜屾鍒涘缓
- // m_SuitEffect = transform.GetComponentInChildren<EquipSuitEffect>();
- // if (m_SuitEffect == null)
- // m_SuitEffect = EquipSuitEffect.Create(transform as RectTransform);
- // }
- // return m_SuitEffect;
- // }
- // }
//鐗╁搧鍩虹鐗规晥锛堢墿鍝佽〃锛�
- ItemBaseEffect m_ItemBaseEffect;
- ItemBaseEffect itemBaseEffect {
- get {
+ UIEffectPlayer m_ItemBaseEffect;
+ UIEffectPlayer itemBaseEffect
+ {
+ get
+ {
if (m_ItemBaseEffect == null)
{
- LoadPrefab();
- //clone 浼氶�犳垚浜屾鍒涘缓
- m_ItemBaseEffect = transform.GetComponentInChildren<ItemBaseEffect>();
- if (m_ItemBaseEffect == null)
- m_ItemBaseEffect = ItemBaseEffect.Create(transform as RectTransform);
+ m_ItemBaseEffect = transform.GetComponentInChildren<UIEffectPlayer>();
}
return m_ItemBaseEffect;
}
}
- // public bool suitEffectDirty { get; set; }
GameObject cellContainer;
protected void LoadPrefab()
@@ -127,31 +168,11 @@
}
if (cellContainer == null)
{
- switch (format)
- {
- case ItemCellformat.Format_64x64:
- cellContainer = UIUtility.CreateWidget("ItemCell_64", "Container_ItemCell");
- break;
- case ItemCellformat.Format_70x70:
- cellContainer = UIUtility.CreateWidget("ItemCell_70", "Container_ItemCell");
- break;
- case ItemCellformat.Format_80x80:
- cellContainer = UIUtility.CreateWidget("ItemCell_80", "Container_ItemCell");
- break;
- case ItemCellformat.Format_84x84:
- cellContainer = UIUtility.CreateWidget("ItemCell_84", "Container_ItemCell");
- break;
- case ItemCellformat.Format_100x100:
- cellContainer = UIUtility.CreateWidget("ItemCell_100", "Container_ItemCell");
- break;
- case ItemCellformat.Format_120x120:
- cellContainer = UIUtility.CreateWidget("ItemCell_120", "Container_ItemCell");
- break;
- }
+ cellContainer = UIUtility.CreateWidget("ItemCell_120", "Container_ItemCell");
if (cellContainer != null)
{
- cellContainer.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
+ cellContainer.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one * GetScale(format));
cellContainer.transform.SetAsFirstSibling();
}
}
@@ -159,7 +180,11 @@
public int itemId { get; private set; }
PackManager packModel { get { return PackManager.Instance; } }
- // EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
+
+ void OnEnable()
+ {
+ LoadPrefab();
+ }
/// <summary>
/// 鍒濆鍖栨暟鎹� bool鍊肩敤鏉ュ垽鏂槸鍚﹂渶瑕佸睍绀鸿瘎鍒嗛珮浣庢垨鑰呰亴涓氶檺鍒�
@@ -191,7 +216,7 @@
bgIcon.SetActive(true);
itemIcon.SetSprite(config.IconKey);
ItemConfig itemConfig = ItemConfig.Get(itemId);
- bgIcon.SetItemBackGround(ItemLogicUtility.Instance.GetItemQuality(itemId, useDataDic), itemConfig.QualityEchoType);
+ bgIcon.SetItemBackGround(ItemLogicUtility.Instance.GetItemQuality(itemId, useDataDic));
if (packModel.textCountShow.ContainsKey(itemId))
{
countText.SetActive(true);
@@ -217,29 +242,41 @@
}
}
- // suitEffect.Display(itemId, suitEffectDirty);
- // suitEffectDirty = false;
- itemBaseEffect.Display(itemId);
- var compareReslut = isCompare ? Compare(type, itemId, score, guid) : 0;
- switch (compareReslut)
+ DisPlayEffect(config);
+
+ // var compareReslut = isCompare ? Compare(type, itemId, score, guid) : 0;
+ // switch (compareReslut)
+ // {
+ // case -1:
+ // stateIcon.SetActive(true);
+ // stateIcon.SetSprite("EquipDownIcon");
+ // break;
+ // case 0:
+ // stateIcon.SetActive(false);
+ // break;
+ // case 1:
+ // stateIcon.SetActive(true);
+ // stateIcon.SetSprite("EquipUpIcon");
+ // break;
+ // case 99:
+ // stateIcon.SetActive(true);
+ // stateIcon.SetSprite("EquipForbidIcon");
+ // break;
+ // }
+
+ if (config.Type == (int)ItemType.Hero)
{
- case -1:
- stateIcon.SetActive(true);
- stateIcon.SetSprite("EquipDownIcon");
- break;
- case 0:
- stateIcon.SetActive(false);
- break;
- case 1:
- stateIcon.SetActive(true);
- stateIcon.SetSprite("EquipUpIcon");
- break;
- case 99:
- stateIcon.SetActive(true);
- stateIcon.SetSprite("EquipForbidIcon");
- break;
+ var heroConfig = HeroConfig.Get(itemId);
+ countryIcon.SetActive(true);
+ countryIcon.SetSprite("herocountry" + heroConfig.Country);
+
}
+ else
+ {
+ countryIcon.SetActive(false);
+ }
+ // pieceIcon.SetActive(); //寰呯瓥鍒掔‘瀹�
}
// / <summary>
@@ -286,21 +323,43 @@
}
}
- // int GetDogzEquipScore(int equipPlace)
- // {
- // var dogzModel = ModelCenter.Instance.GetModel<DogzModel>();
- // ItemModel putOnModel = null;
- // dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out putOnModel);
- // return putOnModel == null ? 0 : putOnModel.score;
- // }
-
- // int GetSpiritWeaponScore(int equipPlace)
- // {
- // var spiritWeaponModel = ModelCenter.Instance.GetModel<SpiritWeaponModel>();
- // var guid = spiritWeaponModel.GetSpiritWeapon((RoleEquipType)equipPlace);
- // var item = packModel.GetItemByGuid(guid);
- // return item != null ? item.score : 0;
- // }
+ void DisPlayEffect(ItemConfig config)
+ {
+ if (config.BaseEffectID == 0)
+ {
+ if (itemBaseEffect != null)
+ {
+ itemBaseEffect.SetActive(false);
+ }
+ }
+ else
+ {
+ itemBaseEffect.SetActive(true);
+ itemBaseEffect.effectId = config.BaseEffectID;
+ itemBaseEffect.Play();
+ }
+ }
+
+ float GetScale(ItemCellformat format)
+ {
+ switch (format)
+ {
+ case ItemCellformat.Format_120x120:
+ return 1f;
+ case ItemCellformat.Format_100x100:
+ return 0.83f;
+ case ItemCellformat.Format_84x84:
+ return 0.7f;
+ case ItemCellformat.Format_80x80:
+ return 0.66f;
+ case ItemCellformat.Format_70x70:
+ return 0.58f;
+ case ItemCellformat.Format_64x64:
+ return 0.53f;
+ default:
+ return 1f;
+ }
+ }
}
diff --git a/Main/System/KnapSack/New/ItemCell.cs b/Main/System/KnapSack/New/ItemCell.cs
index cfe14d8..6602211 100644
--- a/Main/System/KnapSack/New/ItemCell.cs
+++ b/Main/System/KnapSack/New/ItemCell.cs
@@ -1,14 +1,14 @@
-锘縰sing UnityEngine;
-using UnityEngine.UI;
-using System.Collections.Generic;
-using System;
-
+锘�
public class ItemCell : CommonItemBaisc
{
public override void Init(ItemModel model, bool isCompare = false)
{
+ if (model == null)
+ {
+ return;
+ }
base.Init(model, isCompare);
}
diff --git a/Main/System/KnapSack/PackManager.cs b/Main/System/KnapSack/PackManager.cs
index 22e4249..d4acb33 100644
--- a/Main/System/KnapSack/PackManager.cs
+++ b/Main/System/KnapSack/PackManager.cs
@@ -3,12 +3,16 @@
using System.Linq;
using UnityEngine;
using LitJson;
-using System.Text.RegularExpressions;
using System.Collections;
+using System.IO;
public class PackManager : GameSystemManager<PackManager>
-//public class PackModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
+ public Dictionary<int, int> PackMaxCountDict = new Dictionary<int, int>(); //鑳屽寘绫诲瀷锛氳儗鍖呮牸瀛愭渶澶ф暟閲�
+ public Dictionary<int, int> PackInitCountDict = new Dictionary<int, int>(); //鑳屽寘绫诲瀷锛氬垵濮嬫暟閲�
+ public int initBagGridCount { get; private set; } //鍒濆鐗╁搧鑳屽寘鏍煎瓙鏁�
+ public int[] itemPackSortTyps { get; private set; } //鑳屽寘鐗╁搧鐨勬寜绫诲瀷鎺掑簭
+
public static string StrengthAttrShift_RecordKey = "";
public const string RecordKnapsackTitle = "RecordKnapsackTitle";
@@ -329,6 +333,7 @@
DeleteItemDictByGUID(type, guid);
}
}
+ refrechPackEvent?.Invoke(type);
}
public void RemoveItem(H0709_tagClearItem clearItem)
@@ -474,13 +479,54 @@
#region 鐜╁瑁呭鐗规畩閫昏緫
void ParseConfig()
{
-
-
var config = FuncConfigConfig.Get("CommonShowAwards");
commonShowAwardEvents = JsonMapper.ToObject<List<string>>(config.Numerical1);
+ config= FuncConfigConfig.Get("InitBagCellCount");
+ initBagGridCount = int.Parse(config.Numerical1);
+ PackInitCountDict = ConfigParse.ParseIntDict(config.Numerical2);
+
+ config = FuncConfigConfig.Get("PackageSortPriority");
+ itemPackSortTyps = ConfigParse.GetMultipleStr<int>(config.Numerical1);
+ ParsePackConfigIni();
}
+ void ParsePackConfigIni()
+ {
+ string[] lines = LoadConfigIni("MapServerConfig");
+ foreach (string line in lines)
+ {
+ if (line.StartsWith("PackCnt") && line.Contains("="))
+ {
+ string[] parts = line.Split('=');
+ if (parts.Length == 2 && int.TryParse(parts[1], out int count))
+ {
+ string packTypeStr = parts[0].Replace("PackCnt", "");
+ if (int.TryParse(packTypeStr, out int packTypeIndex))
+ {
+ PackMaxCountDict[packTypeIndex] = count;
+ }
+ }
+ }
+ }
+ }
+
+ public string[] LoadConfigIni(string name)
+ {
+ string path = string.Empty;
+#if UNITY_EDITOR
+ if (!AssetSource.isUseAssetBundle)
+ {
+ path = ResourcesPath.CONFIG_FODLER + "/" + name + ".ini";
+ }
+ else
+#endif
+ {
+ path = AssetVersionUtility.GetAssetFilePath($"Config/{name}.ini");
+ }
+
+ return File.ReadAllLines(path);
+ }
private void UpdateSecond()
@@ -550,7 +596,11 @@
public SinglePack GetSinglePack(PackType type)
{
SinglePack singlePack = null;
- playerPackDict.TryGetValue(type, out singlePack);
+ if (!playerPackDict.TryGetValue(type, out singlePack))
+ {
+ singlePack = new SinglePack(type);
+ playerPackDict.Add(type, singlePack);
+ }
return singlePack;
}
diff --git a/Main/System/Main/FuncsBaseWin.cs b/Main/System/Main/FuncsBaseWin.cs
index 94d3429..2a2689c 100644
--- a/Main/System/Main/FuncsBaseWin.cs
+++ b/Main/System/Main/FuncsBaseWin.cs
@@ -9,7 +9,7 @@
public abstract class FunctionsBaseWin : UIBase
{
// 鏍囩鎸夐挳缁�
- public Button[] tabButtons;
+ public GroupButtonEx[] tabButtons;
// 褰撳墠鎵撳紑鐨勫瓙鐣岄潰
protected UIBase currentSubUI;
@@ -19,8 +19,6 @@
/// </summary>
protected override void InitComponent()
{
- base.InitComponent();
-
// 鍒濆鍖朥I缁勪欢浜嬩欢
InitButtonEvents();
}
@@ -71,9 +69,6 @@
// 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
functionOrder = index;
- // 鏇存柊鎸夐挳鐘舵��
- UpdateButtonsState();
-
// 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
CloseCurrentSubUI();
@@ -96,10 +91,7 @@
}
- /// <summary>
- /// 鏇存柊鎸夐挳鐘舵��
- /// </summary>
- protected abstract void UpdateButtonsState();
+
/// <summary>
/// 鏍规嵁鏍囩绱㈠紩鎵撳紑瀵瑰簲鐨勫瓙鐣岄潰
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index b589ac7..95327a6 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -121,22 +121,6 @@
}
-
- /// <summary>
- /// 鏇存柊鎸夐挳鐘舵��
- /// </summary>
- protected override void UpdateButtonsState()
- {
- // 閬嶅巻鎵�鏈夋寜閽紝璁剧疆閫変腑鐘舵��
- // for (int i = 0; i < tabButtons.Length; i++)
- // {
-
- // // bottomTabButtons[i].image.color = (i == currentTabIndex) ? Color.white : Color.gray;
- // }
- }
-
-
-
/// <summary>
/// 鏍规嵁鏍囩绱㈠紩鎵撳紑瀵瑰簲鐨勫瓙鐣岄潰
/// </summary>
@@ -154,7 +138,7 @@
Debug.Log("鎵撳紑涓诲煄鐣岄潰");
break;
case 1:
- // currentSubUI = UIManager.Instance.OpenUI<CharacterUI>();
+ currentSubUI = UIManager.Instance.OpenWindow<RolePackWin>();
Debug.Log("鎵撳紑鍐呮斂鐣岄潰");
break;
case 2:
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index 3c46f91..796466a 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -791,6 +791,7 @@
Equip_Wing = 113, // 缈呰唨
Guard_1 = 114, // 鐏靛畧 1
Guard_2 = 115, //鐏靛畧 2
+ Hero = 150, //姝﹀皢
}
diff --git a/Main/Utility/UIHelper.cs b/Main/Utility/UIHelper.cs
index e5e468a..f135ca8 100644
--- a/Main/Utility/UIHelper.cs
+++ b/Main/Utility/UIHelper.cs
@@ -113,13 +113,13 @@
}
// 鍩轰簬itemColor 涓嬶紝ColorEx鍋氫簩绾у尯鍒�
- public static void SetItemBackGround(this Image _image, int itemColor, int ColorEx = 0)
+ public static void SetItemBackGround(this Image _image, int itemColor)
{
if (_image == null)
{
return;
}
- _image.SetSprite(string.Format("Common_Public_ItemColor{0}{1}", itemColor, ColorEx));
+ _image.SetSprite($"ItemBG{itemColor}");
}
/// <summary>
/// 鍓╀綑鏃堕棿
--
Gitblit v1.8.0