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

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

This commit is contained in:
koya_15 2022-07-21 15:46:46 +09:00
parent 4eded0929c 104c789a1c
commit 04abc13fa4
8 changed files with 294 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim
View File

@ -146,17 +146,17 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: 1.3457108, y: -1.2956285, z: 0}
inSlope: {x: -3.440333, y: 0.017254356, z: 0}
outSlope: {x: -3.440333, y: 12.737325, z: 0}
inSlope: {x: -3.440333, y: 0, z: 0}
outSlope: {x: -3.440333, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.57309645, z: 0.33333334}
outWeight: {x: 0.5185951, y: 0.21678068, z: 0.33333334}
- serializedVersion: 3
time: 0.28333333
value: {x: 0.8993912, y: 0.33847833, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
value: {x: 0.8993912, y: -1.3443205, z: 0}
inSlope: {x: 0, y: -0.1489406, z: 0}
outSlope: {x: 0, y: -0.1489406, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -164,11 +164,11 @@ AnimationClip:
- serializedVersion: 3
time: 0.53333336
value: {x: 1.3457108, y: -1.2956285, z: 0}
inSlope: {x: 4.6796384, y: -15.697801, z: 0}
outSlope: {x: 0, y: 7.232945, z: 0}
inSlope: {x: 4.6796384, y: 0.6901133, z: 0}
outSlope: {x: 0, y: 0.6901133, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.45025653, y: 0.12783264, z: 0.33333334}
inWeight: {x: 0.45025653, y: 0.27362296, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.34686986, z: 0.33333334}
- serializedVersion: 3
time: 0.73333335
@ -953,29 +953,20 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: -1.2956285
inSlope: 0.017254356
outSlope: 12.737325
tangentMode: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.57309645
outWeight: 0.21678068
- serializedVersion: 3
time: 0.28333333
value: 0.33847833
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: -1.2956285
inSlope: -15.697801
outSlope: 7.232945
tangentMode: 1
inSlope: 0.6901133
outSlope: 0.6901133
tangentMode: 0
weightedMode: 0
inWeight: 0.12783264
inWeight: 0.27362296
outWeight: 0.34686986
- serializedVersion: 3
time: 0.73333335

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
moqPsQxWfq5Mg6K5Emg0v12oKfT6MWN3sX1KIMNUklIZ5YTgoIiUHsDsZrIXKig6
0JGb9UFU1CZQRt0MuqSjmQaMks+ukOMHyibSk9e/RWR/9+8DZVkG3vJda/5phs/v

2
popcorn/Assets/MyGame/Resources/Data/ScrollGameStageData.txt
View File

@ -1 +1 @@
YSw7lAkWUkTTpW6zqS1CkL7idYc0g1AqPvzeycz4RrmGbUMcPKc4YzxTIMubHqrCorilP10YJCZWkVx01VEGqyH/hZoIOdQQ73LWkev5ZmJDYQG0AjzqlJQL/KdWq7DwWXzf0CCz35amNk9pzj9KRMYWOqDQKh52Yq607H6t2NwxWgmR9Cnm4EVXRS3UD5GIauLgE941Cgx8nRkoCL5ZVOdqgZc73NRRqeAZm5BbrKjIzL1yWu9yzCfknqwwwfZoo7ckP77Zbd9btKCZ13OywyX/vESaCfBN4QfNkz7Ztv8yLpcZh8GWouPcP7yPaJc9XT6cAk7a8OZTiPV+72fBaw==
T9yYpLdNTe7fylu3p4xoW68Q9Psu55096yYGlmq2fF4pnXfdNib/D6ystQBOz7l3IboWE0BL2Q2fVTVpR2Tr17YWb4ahLSuEIFWbx6PowbbnGB9E0uzc+MwAtQzDcPI87NoYZvswjzHSxCyLMCF7S5nDwTdjWI7Rv83jqcmjyRAFM39wG33wHTyXS1Rzlyz2IpYTdDDqhu7ka9yQEwAv4PJBnL8FU5kR71M+hapC/y/a7GASlbh18l2ylNR+SpSGjWAqPTN2Iypp1rfuZE+8KbZfNHb0UcyAdsxZAIEQzE/IdfUnfACfBQrjsOsTN7+fhLhKLnqePn7u5V69+BnCAg==

155
popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1a.prefab
View File

@ -26,6 +26,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 67.6, y: 2.3177245, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2233378810729895866}
m_RootOrder: 13
@ -56,6 +57,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 148.91467, y: 2.3177247, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2233378810729895866}
m_RootOrder: 14
@ -86,6 +88,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5773823170437794030}
- {fileID: 3797191648523980540}
@ -118,9 +121,86 @@ Transform:
- {fileID: 4545994079582372957}
- {fileID: 5326442771015433769}
- {fileID: 7365787778889676682}
- {fileID: 1476950964409956052}
- {fileID: 8219468973470991646}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &217337322915256491
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2233378810729895866}
m_Modifications:
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_RootOrder
value: 31
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalPosition.x
value: 8.87
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8252989683844914566, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
propertyPath: m_Name
value: Obstacle hole
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ae1cc9a622fcf6d4fb54da4baa89eac8, type: 3}
--- !u!4 &1476950964409956052 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1691959517394185855, guid: ae1cc9a622fcf6d4fb54da4baa89eac8,
type: 3}
m_PrefabInstance: {fileID: 217337322915256491}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &227090641209505670
PrefabInstance:
m_ObjectHideFlags: 0
@ -2076,6 +2156,81 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 6671092691026167700}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6868054885343884598
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2233378810729895866}
m_Modifications:
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_RootOrder
value: 32
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalPosition.x
value: 3.6
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.92
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4549021134508373885, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
propertyPath: m_Name
value: Obstacle_Bee 1x1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 650bc5479fb99c94a8a010bd449f9269, type: 3}
--- !u!4 &8219468973470991646 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3260976648670654504, guid: 650bc5479fb99c94a8a010bd449f9269,
type: 3}
m_PrefabInstance: {fileID: 6868054885343884598}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6904641699929328292
PrefabInstance:
m_ObjectHideFlags: 0

77
popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity
View File

@ -1392,16 +1392,91 @@ PrefabInstance:
propertyPath: fallSpeed
value: 0.07
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitJumpTime
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: fallAcceleration
value: 30
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_PostInfinity
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].time
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].time
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].value
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].value
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: jumpAnimationCurve.m_Curve.Array.data[1].value
value: 6.5
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].inSlope
value: 2.4237015
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].inSlope
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].outSlope
value: 2.4237015
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].inWeight
value: 0.33333334
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].outSlope
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].outWeight
value: 0.04351728
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[0].tangentMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitAnimationCurve.m_Curve.Array.data[1].tangentMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4931350312200274921, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: m_RootOrder
@ -2723,7 +2798,7 @@ PrefabInstance:
- target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9,
type: 3}

2
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle hole.prefab
View File

@ -1606,7 +1606,7 @@ PrefabInstance:
- target: {fileID: 1814670119296341110, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.75
value: -3.3
objectReference: {fileID: 0}
- target: {fileID: 3565643019619598235, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}

8
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle_Bee 1x1.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 606458492868858506}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.02, y: 0.34, z: -43.01684}
m_LocalPosition: {x: 1.02, y: 0.34, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -109,7 +109,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1756498083787301531}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.57, y: 0.412, z: -43.01684}
m_LocalPosition: {x: 0.57, y: 0.412, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -238,7 +238,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5639538910414099634}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.44, y: -0.65, z: -43.01684}
m_LocalPosition: {x: 0.44, y: -0.65, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -322,7 +322,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6411727127687482797}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -43.01684}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []

67
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs
View File

@ -8,7 +8,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
public class Player : MonoBehaviour
{
[SerializeField] private float speed = 5f;
[SerializeField] private float fallTime = 1f;
[SerializeField] private float hitJumpTime = 1f;
[SerializeField] private float hitTime = 1.5f;
[SerializeField] private float hitWaitTime = 1f;
[SerializeField] private AnimationCurve jumpAnimationCurve;
@ -164,43 +164,58 @@ namespace MyGame.Scenes.MiniGame.Scripts
}
Instantiate(hitEffectPrefab, hitPos, Quaternion.identity, transform.parent);
SoundManager.Instance.PlaySE("se_minigame_Collide");
animator?.Play("Brother_pink_FallDown");
isHit = true;
hitDisposable?.Dispose();
// ヒット以外動作停止
this.SafeStopCoroutine(jumpCoroutine);
this.SafeStopCoroutine(jumpFallCoroutine);
jumpHoldDisposable?.Dispose();
var diffHeight = transform.localPosition.y - basePos.y;
jumpCoroutine = this.CallLerp(diffHeight == 0f ? 0f : fallTime, t =>
var cachePosY = transform.localPosition.y;
var diffHeight = cachePosY - basePos.y;
jumpCoroutine = this.CallLerp(diffHeight == 0f ? 0f : hitJumpTime, t =>
{
transform.SetLocalPositionY(basePos.y + hitAnimationCurve.Evaluate(t) * diffHeight);
transform.SetLocalPositionY(cachePosY + hitAnimationCurve.Evaluate(t));
}, () =>
{
isJump = false;
isFall = false;
isFlying = false;
SoundManager.Instance.PlaySE("se_minigame_FallDown");
this.CallLerp(hitTime, t =>
{
}, () =>
{
isHitStay.Value = true;
this.CallWaitForSeconds(hitWaitTime, () =>
// 落下時間不定によりアニメ再生停止
animator.speed = 0f;
var currentSpeed = 0f;
this.UpdateAsObservable()
.TakeWhile(_ => transform.localPosition.y > basePos.y)
.Subscribe(_ =>
{
isHit = false;
isHitStay.Value = false;
if (isResult)
currentSpeed -= fallAcceleration * Time.deltaTime;
transform.AddLocalPositionY(currentSpeed * Time.deltaTime);
}, () =>
{
// 31フレームまでが落下32からズサー
animator?.PlayInFixedTime("Brother_pink_FallDown", 0, .5f);
animator.speed = 1f;
transform.SetLocalPositionY(basePos.y);
isJump = false;
isFall = false;
isFlying = false;
this.CallWaitForSeconds(hitTime, () =>
{
Result();
}
else
{
Stay();
}
});
});
isHitStay.Value = true;
this.CallWaitForSeconds(hitWaitTime, () =>
{
isHit = false;
isHitStay.Value = false;
if (isResult)
{
Result();
}
else
{
Stay();
}
});
});
}).AddTo(this);
});
}