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

Merge branch 'feture/update_ver1.1.0' of https://bitbucket.org/usaya/popcorn into feture/update_ver1.1.0

This commit is contained in:
水谷圭吾 2022-02-10 17:00:32 +09:00
parent d0e454319b 7552933e7d
commit d31b4b5d82
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
View File

@ -66,6 +66,11 @@ MonoBehaviour:
type: 3} type: 3}
coinCount: 5 coinCount: 5
heartCount: 5 heartCount: 5
minCurve: 100
maxCurve: 400
waitTime: 0.3
curveTime: 0.5
linerTime: 0.3
--- !u!1 &137127162501263386 --- !u!1 &137127162501263386
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

3
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedEffect.cs
View File

@ -16,6 +16,7 @@ namespace MyGame.Scenes.Main.Scripts
[SerializeField] private int heartCount = 5; [SerializeField] private int heartCount = 5;
[SerializeField] private float minCurve = 100f; [SerializeField] private float minCurve = 100f;
[SerializeField] private float maxCurve = 400f; [SerializeField] private float maxCurve = 400f;
[SerializeField] private float waitTime = .3f;
[SerializeField] private float curveTime = .5f; [SerializeField] private float curveTime = .5f;
[SerializeField] private float linerTime = .5f; [SerializeField] private float linerTime = .5f;
private readonly Subject<Unit> effectCompleteSubject = new Subject<Unit>(); private readonly Subject<Unit> effectCompleteSubject = new Subject<Unit>();
@ -77,7 +78,7 @@ namespace MyGame.Scenes.Main.Scripts
var direction = Random.value <= .5f ? -1 : 1; var direction = Random.value <= .5f ? -1 : 1;
var depth = Random.Range(minCurve, maxCurve); var depth = Random.Range(minCurve, maxCurve);
this.CallWaitForSeconds(beginDuration, () => this.CallWaitForSeconds(waitTime, () =>
{ {
animator.Play(nameHash, 0, beginNormalizedTime); animator.Play(nameHash, 0, beginNormalizedTime);
animator.speed = 0f; animator.speed = 0f;