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

吹き出し対応

This commit is contained in:
kimura 2021-09-03 18:34:16 +09:00
parent 2c728c4fd0
commit 93c2e850fc
4 changed files with 42 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
popcorn/Assets/MyGame/Resource/Animation/NormalBody.controller
View File

@ -76,32 +76,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4685533525633903185
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: customer_nomal_stay_back_look
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8ecc03c0ea9b8b148a20e7c1a1c1a57a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-3557210042345114067
AnimatorStateMachine:
serializedVersion: 5
@ -121,31 +95,6 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 0}
--- !u!1101 &-3061360668537635468
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: StayBackLook
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4685533525633903185}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-2685166620078894664
AnimatorState:
serializedVersion: 5
@ -199,12 +148,6 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: StayBackLook
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: StayBack
m_Type: 9
m_DefaultFloat: 0
@ -332,19 +275,16 @@ AnimatorStateMachine:
m_Position: {x: 340, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: -6652428263484434225}
m_Position: {x: 400, y: 130, z: 0}
m_Position: {x: 370, y: 70, z: 0}
- serializedVersion: 1
m_State: {fileID: -2685166620078894664}
m_Position: {x: 430, y: 190, z: 0}
m_Position: {x: 400, y: 130, z: 0}
- serializedVersion: 1
m_State: {fileID: 7323215065137421921}
m_Position: {x: 470, y: 260, z: 0}
m_Position: {x: 430, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: 7484173205884000859}
m_Position: {x: 310, y: 330, z: 0}
- serializedVersion: 1
m_State: {fileID: -4685533525633903185}
m_Position: {x: 370, y: 70, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 3241850798776372350}
@ -353,7 +293,6 @@ AnimatorStateMachine:
- {fileID: 6505056884794429815}
- {fileID: 8021089965930707737}
- {fileID: -6933872665675759000}
- {fileID: -3061360668537635468}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []

24
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customer.prefab
View File

@ -46,6 +46,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 5409985851491668857}
orderPopup: {fileID: 5409985850085678672}
leftPopcorn: {fileID: 1950136324582499262}
rightPopcorn: {fileID: 1950136324150437342}
frontPopcorn: {fileID: 1950136324089803489}
@ -123,6 +124,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5409985849651702441}
m_Modifications:
- target: {fileID: 3340056901353795718, guid: db654393793a67d45a7d0b70a68b73a6,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6,
type: 3}
propertyPath: m_RootOrder
@ -234,12 +240,6 @@ SpriteRenderer:
type: 3}
m_PrefabInstance: {fileID: 631677504613307640}
m_PrefabAsset: {fileID: 0}
--- !u!212 &5409985849570169883 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 4886416730275037411, guid: db654393793a67d45a7d0b70a68b73a6,
type: 3}
m_PrefabInstance: {fileID: 631677504613307640}
m_PrefabAsset: {fileID: 0}
--- !u!212 &1950136324150437342 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 1428887861146841382, guid: db654393793a67d45a7d0b70a68b73a6,
@ -264,3 +264,15 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 631677504613307640}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5409985850085678672 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4886416729748261544, guid: db654393793a67d45a7d0b70a68b73a6,
type: 3}
m_PrefabInstance: {fileID: 631677504613307640}
m_PrefabAsset: {fileID: 0}
--- !u!212 &5409985849570169883 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 4886416730275037411, guid: db654393793a67d45a7d0b70a68b73a6,
type: 3}
m_PrefabInstance: {fileID: 631677504613307640}
m_PrefabAsset: {fileID: 0}

30
popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs
View File

@ -10,8 +10,8 @@ public enum CustomerMovingType
WalkSide,
WalkSideEat,
WalkCenter,
StayBackOrder,
StayBack,
StayBackLook,
WalkBack,
WalkBackHalf,
WalkFront,
@ -33,12 +33,12 @@ public class CustomerController : MonoBehaviour
private static readonly int WalkSide = Animator.StringToHash("WalkSide");
private static readonly int WalkBack = Animator.StringToHash("WalkBack");
private static readonly int StayBack = Animator.StringToHash("StayBack");
private static readonly int StayBackLook = Animator.StringToHash("StayBackLook");
private static readonly int WalkFrontEat = Animator.StringToHash("WalkFrontEat");
private static readonly int WalkSideEat = Animator.StringToHash("WalkSideEat");
[SerializeField] private Animator animator;
[SerializeField] private GameObject orderPopup;
[SerializeField] private SpriteRenderer leftPopcorn;
[SerializeField] private SpriteRenderer rightPopcorn;
[SerializeField] private SpriteRenderer frontPopcorn;
@ -111,7 +111,7 @@ public class CustomerController : MonoBehaviour
beginPos.x = leftEndPosision * walkSideDirection;
beginPos.y = Random.Range(walkSideMidPos, walkSideBottomPos);
transform.localPosition = beginPos;
currentMovingType = CustomerMovingType.StayBack;
currentMovingType = CustomerMovingType.StayBackOrder;
SetWayPoint(beginPos);
}
@ -124,7 +124,7 @@ public class CustomerController : MonoBehaviour
case CustomerState.Walk:
SetMove(CustomerMovingType.WalkCenter);
// 数秒立ち止まる
AddMove(CustomerMovingType.StayBackLook, 2f);
AddMove(CustomerMovingType.StayBack, 2f);
AddMove(CustomerMovingType.WalkSide);
break;
case CustomerState.Wait:
@ -132,7 +132,7 @@ public class CustomerController : MonoBehaviour
// 近くの場合その場に待機
// まだ遠い場合待機場所に移動
moves.Clear();
if (currentMovingType == CustomerMovingType.StayBackLook)
if (currentMovingType == CustomerMovingType.StayBack)
{
SetMove(CustomerMovingType.WalkBackHalf);
}
@ -141,12 +141,12 @@ public class CustomerController : MonoBehaviour
SetMove(CustomerMovingType.WalkCenter);
AddMove(CustomerMovingType.WalkBackHalf);
}
AddMove(CustomerMovingType.StayBackLook);
AddMove(CustomerMovingType.StayBack);
break;
case CustomerState.Order:
// 受付まで行く
AddMove(CustomerMovingType.WalkBack);
AddMove(CustomerMovingType.StayBack);
AddMove(CustomerMovingType.StayBackOrder);
break;
case CustomerState.Leave:
moves.Clear();
@ -210,14 +210,14 @@ public class CustomerController : MonoBehaviour
}
animator.SetTrigger(WalkSide);
break;
case CustomerMovingType.StayBack:
case CustomerMovingType.StayBackOrder:
// オーダー
speed = 0f;
animator.SetTrigger(StayBack);
break;
case CustomerMovingType.StayBackLook:
case CustomerMovingType.StayBack:
speed = 0f;
animator.SetTrigger(StayBackLook);
animator.SetTrigger(StayBack);
break;
case CustomerMovingType.WalkBack:
SetWayPoint(new Vector3(Random.value * orderPositionRange * walkSideDirection, orderPosision));
@ -254,7 +254,7 @@ public class CustomerController : MonoBehaviour
transform.localRotation = Quaternion.Euler((wayPoint - transform.localPosition).x >= 0 ? Vector3.zero : Vector3.up * 180);
}
public void ChangeWantFlavor(int flavor)
public void ShowWantFlavor(int flavor)
{
if (flavor == 2)
{
@ -270,5 +270,11 @@ public class CustomerController : MonoBehaviour
frontPopcorn.sprite = defaultSprite;
wantFlavorSprite.sprite = defaultSprite;
}
orderPopup.SetActive(true);
}
public void HideOrderPopup()
{
orderPopup.SetActive(false);
}
}

6
popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
View File

@ -178,7 +178,7 @@ public class Market : MonoBehaviour
shuffledOrder.RemoveRange(0, tmpOrderCount);
// コーンの味吹き出しを設定(レア度優先など
controller.ChangeWantFlavor(displayFlavors[orders.RandomChoose()]);
controller.ShowWantFlavor(displayFlavors[orders.RandomChoose()]);
}
foreach (var customerController in dontBuyCustomerList)
{
@ -232,7 +232,6 @@ public class Market : MonoBehaviour
{
cartView.SellStock(order);
}
blueView.SellAction();
// コイン獲得
CoinManager.Instance.AddCoinWithEffect(coin, () => { });
@ -246,6 +245,7 @@ public class Market : MonoBehaviour
{
foreach (var customerController in customers)
{
customerController.HideOrderPopup();
var heartAnimation = customerController.GetComponent<HeartAnimation>();
heartAnimation.GetHeart(() =>
{
@ -354,7 +354,7 @@ public class Market : MonoBehaviour
case CustomerMovingType.WalkBackHalf:
waitCustomerList.Add(customerController);
break;
case CustomerMovingType.StayBack:
case CustomerMovingType.StayBackOrder:
requestSubject.OnNext(customerController);
break;
default: