yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-11-18 19:26:44 +09:00
parent fe07bc4f88 45eda7c134
commit ba82fd75a8
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
popcorn/Assets/MyGame/Prefabs/TutorialObjectMask.prefab
View File

@ -178,6 +178,7 @@ MonoBehaviour:
unmask: {fileID: 4293843007976718248} unmask: {fileID: 4293843007976718248}
unmaskArrow: {fileID: 5618796564699367770} unmaskArrow: {fileID: 5618796564699367770}
unMaskImage: {fileID: 4293843007976718250} unMaskImage: {fileID: 4293843007976718250}
backgroundImage: {fileID: 4293843007207798080}
arrowAnimator: {fileID: 7626766843417898212} arrowAnimator: {fileID: 7626766843417898212}
--- !u!223 &1057350325820014940 --- !u!223 &1057350325820014940
Canvas: Canvas:

3
popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs
View File

@ -319,6 +319,9 @@ public class CornField : MonoBehaviour
.Take(3) .Take(3)
.Subscribe(_ => { }, () => .Subscribe(_ => { }, () =>
{ {
// マスクの透明度変更
cornFieldMask.SetBGAlpha(0f);
cornFieldMask.SetArrowActive(false);
this.CallWaitForSeconds(4f, () => this.CallWaitForSeconds(4f, () =>
{ {
cornFieldMask.gameObject.SetActive(false); cornFieldMask.gameObject.SetActive(false);

6
popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs
View File

@ -9,6 +9,7 @@ namespace MyGame.Scripts
[SerializeField] private Unmask unmask; [SerializeField] private Unmask unmask;
[SerializeField] private Unmask unmaskArrow; [SerializeField] private Unmask unmaskArrow;
[SerializeField] private Image unMaskImage; [SerializeField] private Image unMaskImage;
[SerializeField] private Image backgroundImage;
[SerializeField] private Animator arrowAnimator; [SerializeField] private Animator arrowAnimator;
private static readonly int Under = Animator.StringToHash("Under"); private static readonly int Under = Animator.StringToHash("Under");
@ -70,5 +71,10 @@ namespace MyGame.Scripts
// rt.sizeDelta = target.rect.size; // rt.sizeDelta = target.rect.size;
rt.anchorMax = rt.anchorMin = new Vector2(0.5f, 0.5f); rt.anchorMax = rt.anchorMin = new Vector2(0.5f, 0.5f);
} }
public void SetBGAlpha(float a)
{
backgroundImage.color = backgroundImage.color.SetA(a);
}
} }
} }