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

yyl

2026-01-14 1554540dadfe8a948ed1557e4849be7a8a994aef

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

 Main/System/Guild/GuildBossWin.cs

@@ -434,12 +434,12 @@
            if (i < GuildBossManager.Instance.atkResult.HurtCount)
            {
                int index = i;
                hurtValues[i].SetActive(true);
                hurtValues[i].transform.localScale = Vector3.one;
                var tween = hurtValues[i].GetComponent<PositionTween>();
                tween.SetStartState();
                tween.Play(() =>
                {
                    hurtValues[index].SetActive(false);
                    hurtValues[index].transform.localScale = Vector3.zero;
                });
                var hurtData = GuildBossManager.Instance.atkResult.HurtList[i];
                BattleDmg dmg = new BattleDmg()
@@ -448,11 +448,11 @@
                    attackType = hurtData.IsSuper == 1 ? (int)DamageType.CritDamage : 2
                };
                hurtValues[i].text = BattleUtility.DisplayDamageNum(dmg);
                await UniTask.Delay(100);
                await UniTask.Delay(200);
            }
            else
            {
                hurtValues[i].SetActive(false);
                hurtValues[i].transform.localScale = Vector3.zero;
            }
        }

@@ -461,23 +461,23 @@
            if (i < GuildBossManager.Instance.atkResult.ItemCount)
            {
                var itemData = GuildBossManager.Instance.atkResult.ItemList[i];
                awardValues[i].SetActive(true);
                var tween = hurtValues[i].GetComponent<PositionTween>();
                awardValues[i].transform.localScale = Vector3.one;
                var tween = awardValues[i].GetComponent<PositionTween>();
                tween.SetStartState();
                int index = i;
                tween.Play(() =>
                {
                    awardValues[index].SetActive(false);
                    awardValues[index].transform.localScale = Vector3.zero;
                });


                awardValues[i].text = itemData.Count.ToString();
                awardIcons[i].SetItemSprite((int)itemData.ItemID);
                await UniTask.Delay(100);
                await UniTask.Delay(200);
            }
            else
            {
                awardValues[i].SetActive(false);
                awardValues[i].transform.localScale = Vector3.zero;
            }
        }

@@ -487,12 +487,12 @@
    {
        for (int i = 0; i < hurtValues.Length; i++)
        {
            hurtValues[i].SetActive(false);
            hurtValues[i].transform.localScale = Vector3.zero;
        }

        for (int i = 0; i < awardValues.Length; i++)
        {
            awardValues[i].SetActive(false);
            awardValues[i].transform.localScale = Vector3.zero;
        }

        heroModel.transform.localPosition = pos1.localPosition;

 Main/System/KnapSack/Logic/ComposeGirdCell.cs

@@ -33,7 +33,7 @@
        {

            fullImage.SetActive(true);

            fillImage.SetActive(false);

            redImg.SetActive(true);

            redImg.SetActive(!PackManager.Instance.noRedpointComposeItemIDs.Contains(materialID));

        }

        else

        {