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

自機アニメーション設定

This commit is contained in:
kimura 2022-06-29 12:43:24 +09:00
parent 0d33ab049c
commit 810a6c9b7d
5 changed files with 84 additions and 1661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,12 +277,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &519190655 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2498033717167142639, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
m_PrefabInstance: {fileID: 2498033716723453584}
m_PrefabAsset: {fileID: 0}
--- !u!1 &579812654
GameObject:
m_ObjectHideFlags: 0
@ -367,6 +361,24 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 4559813503860727169}
m_PrefabAsset: {fileID: 0}
--- !u!4 &787907550 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6362814815096740739, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
m_PrefabInstance: {fileID: 2498033716723453584}
m_PrefabAsset: {fileID: 0}
--- !u!114 &787907554 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4040854585885567868, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
m_PrefabInstance: {fileID: 2498033716723453584}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2273f282da84488498cab0d1b34f1d63, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &966618982
GameObject:
m_ObjectHideFlags: 0
@ -809,9 +821,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 96c2b99ef2e6c42dd998b782def0bd0e, type: 3}
m_Name:
m_EditorClassIdentifier:
timeLimit: 3
timeLimit: 6
headerView: {fileID: 7328251774669809638}
player: {fileID: 2498033716723453586}
player: {fileID: 787907554}
stageSelectView: {fileID: 2071735749}
footerManager: {fileID: 4559813503860727170}
stageManager: {fileID: 1870432536}
@ -846,7 +858,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isDebug:
value: 1
character: {fileID: 519190655}
character: {fileID: 787907550}
resetScoreButton: {fileID: 1725870973}
resetPlayCountButton: {fileID: 2085388516}
--- !u!114 &1870432536
@ -1158,6 +1170,11 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 1673325602}
- target: {fileID: 2498033717167142416, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2498033717375854813, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
propertyPath: m_AnchorMax.y
@ -1188,6 +1205,21 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 217
objectReference: {fileID: 0}
- target: {fileID: 6362814815096740739, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6390956298179763278, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6506543499675285520, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
propertyPath: m_UseAutoMass
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
propertyPath: m_RootOrder
@ -1251,18 +1283,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 2498033716723453584}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2498033716723453586 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6390956298179763278, guid: 417e2c534d3274ba1a973fe4284532bd,
type: 3}
m_PrefabInstance: {fileID: 2498033716723453584}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2273f282da84488498cab0d1b34f1d63, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &4559813503860727169
PrefabInstance:
m_ObjectHideFlags: 0

4
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab
View File

@ -467,7 +467,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088131638166771230}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -14.434048, y: -0.001329422, z: 29.6}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_Children:
- {fileID: 5922580241095183707}
@ -584,7 +584,7 @@ Rigidbody2D:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088131638166771230}
m_BodyType: 0
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0

1657
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab
View File

File diff suppressed because it is too large Load Diff

1
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
View File

@ -256,6 +256,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
{
stageManager.ResetStage();
player.transform.position = characterBeginPos;
player.Stay();
scoreCount.Value = 0;
headerView.ChangeTimeCount(timeLimit);
resultManager.Reset();

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

@ -13,6 +13,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
[SerializeField] private float fallTime = 1f;
[SerializeField] private float hitTime = 1.5f;
[SerializeField] private float hitWaitTime = 1f;
private Animator animator;
private bool isJump;
private bool isPreHit;
private readonly BoolReactiveProperty isHit = new BoolReactiveProperty();
@ -24,6 +25,12 @@ namespace MyGame.Scenes.MiniGame.Scripts
{
isHit.AddTo(this);
basePos = transform.localPosition;
animator = GetComponent<Animator>();
}
public void Stay()
{
animator?.Play("Brother_pink_main_stay");
}
public void Move()
@ -33,6 +40,11 @@ namespace MyGame.Scenes.MiniGame.Scripts
return;
}
transform.AddPositionX(speed * Time.deltaTime);
if (isJump || isPreHit)
{
return;
}
animator?.Play("Brother_pink_run");
}
public void Jump()
@ -42,6 +54,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
return;
}
animator?.Play("Brother_pink_jump");
isJump = true;
jumpCoroutine = this.CallLerp(jumpTime, t =>
{
@ -59,10 +72,11 @@ namespace MyGame.Scenes.MiniGame.Scripts
{
return;
}
animator?.Play("Brother_pink_FallDown");
isPreHit = true;
hitDisposable?.Dispose();
StopCoroutine(jumpCoroutine);
this.SafeStopCoroutine(jumpCoroutine);
var diffHeight = transform.localPosition.y - basePos.y;
jumpCoroutine = this.CallLerp(diffHeight == 0f ? 0f : fallTime, t =>
{
@ -71,12 +85,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
}, () =>
{
isJump = false;
var orgRotation = transform.localRotation;
var orgYAngle = orgRotation.eulerAngles.y;
transform.rotation = Quaternion.identity;
this.CallLerp(hitTime, t =>
{
transform.localRotation = Quaternion.AngleAxis(orgYAngle + t * (3f * 360), Vector3.up);
}, () =>
{
isHit.Value = true;
@ -84,6 +94,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
{
isPreHit = false;
isHit.Value = false;
Stay();
});
});
});