Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2025-08-07 f4bb83fc7902cf87ba43b918c87c1d96ee5dbc14

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

 Main/ResModule/ResManager.cs

@@ -65,7 +65,7 @@
    {
        {typeof(GameObject), "prefab"},
        {typeof(Sprite), "png"},
        {typeof(Texture2D), "png"},
        {typeof(Texture2D), "jpg"},
        {typeof(Shader), "shader"},
        {typeof(TextAsset), "txt"},
        {typeof(AudioClip), "wav"},

 Main/System/ItemTip/BoxItemWin.cs

@@ -29,7 +29,15 @@
    {
        openButton.AddListener(() =>
        {
            ItemLogicUtility.Instance.UseItem(guid, useCnt);
            if (useCnt == 0)
            {
                CloseWindow();
                return;
            }
            if (ItemLogicUtility.Instance.UseItem(guid, useCnt))
            {
                CloseWindow();
            }
        });
    }


 Main/System/ItemTip/ChooseItemsWin.cs

@@ -21,7 +21,10 @@
    {

        openButton.AddListener(() =>

        {

            BoxGetItemModel.Instance.TrySendUse();

            if (BoxGetItemModel.Instance.TrySendUse())

            { 
                CloseWindow();

            }

        });

    }




 Main/System/ItemTip/ItemTipWin.cs

@@ -17,7 +17,14 @@
    protected override void OnPreOpen()
    {
        var item = ItemTipUtility.mainTipData.baseInfo;
        itemCell.Init(new ItemCellModel(item.itemId, false, (ulong)item.count));
        if (string.IsNullOrEmpty(ItemTipUtility.mainTipData.guid))
        {
            itemCell.Init(new ItemCellModel(item.itemId, false, (ulong)item.count));
        }
        else
        {
            itemCell.Init(PackManager.Instance.GetItemByGuid(ItemTipUtility.mainTipData.guid));
        }
        var itemConfig = ItemConfig.Get(item.itemId);
        nameText.text = itemConfig.ItemName;
        descText.text = itemConfig.Description;

 Main/System/KnapSack/Logic/ItemLogicUtility.cs

@@ -1392,18 +1392,19 @@
        getItemEventName = "";

    }



    public void UseItem(string guid, int useCnt = 1, int extra = 0)

    public bool UseItem(string guid, int useCnt = 1, int extra = 0)

    {

        var item = packModel.GetItemByGuid(guid);

        if (item == null)

        {

            return;

            return false;

        }



        var error = 0;

        if (CanUseItem(guid, useCnt, out error))

        {

            UseItemSendServer(guid, useCnt, extra);

            return true;

        }

        else

        {

@@ -1421,6 +1422,7 @@
                default:

                    break;

            }

            return false;

        }

    }




 Main/System/KnapSack/Logic/PackGirdCell.cs

@@ -15,17 +15,8 @@
            return;



        var item = PackManager.Instance.GetItemByGuid(guid);

        ulong count = 0;

        if (GeneralDefine.itemMoneyCountDict.ContainsKey(item.itemId))

        {

            //展示货币数量的物品

            count = UIHelper.GetMoneyCnt(GeneralDefine.itemMoneyCountDict[item.itemId]);

        }

        else

        {

            count = (ulong)item.count;

        }

        itemCell.Init(new ItemCellModel(item.itemId, false, count));



        itemCell.Init(item);

        itemCell.button.AddListener(()=>

        {

            ItemTipUtility.Show(guid);


 Main/System/KnapSack/New/CommonItemBaisc.cs

@@ -224,12 +224,25 @@
            countText.SetActive(true);

            countText.text = count > 1000000 ? UIHelper.ReplaceLargeNum(count / 100.0f) : (count / 100.0f).ToString("0.#");

        }

        else if (!string.IsNullOrEmpty(guid))

        { 
            if (GeneralDefine.itemMoneyCountDict.ContainsKey(itemId))

            {

                //展示货币数量的物品

                count = UIHelper.GetMoneyCnt(GeneralDefine.itemMoneyCountDict[itemId]);

            }

            countText.SetActive(count > 0);

            if (count > 0)

            {

                countText.text = UIHelper.ReplaceLargeNum(count);

            }

        }

        else

        {

            countText.SetActive(count > 0);

            if (count > 0)

            {

                countText.text = UIHelper.ReplaceLargeNum((double)count);

                countText.text = UIHelper.ReplaceLargeNum(count);

            }

        }