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-09-16 19:28:27 +09:00
parent c5ec654966 27edf3e392
commit d400656fe9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ public enum CustomerState
Wait, Wait,
Order, Order,
Leave, Leave,
SadLeave,
EatingLeave, EatingLeave,
} }
@ -164,6 +165,10 @@ public class CustomerController : MonoBehaviour
case CustomerState.Leave: case CustomerState.Leave:
ForceSetMove(CustomerMovingType.WalkSide); ForceSetMove(CustomerMovingType.WalkSide);
break; break;
case CustomerState.SadLeave:
AddMove(CustomerMovingType.WalkFront);
AddMove(CustomerMovingType.WalkSide);
break;
case CustomerState.EatingLeave: case CustomerState.EatingLeave:
AddMove(CustomerMovingType.WalkFrontEat); AddMove(CustomerMovingType.WalkFrontEat);
AddMove(CustomerMovingType.WalkSideEat); AddMove(CustomerMovingType.WalkSideEat);

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

@ -173,7 +173,7 @@ public class Market : MonoBehaviour
controller.CallWaitForSeconds(1.5f, () => controller.CallWaitForSeconds(1.5f, () =>
{ {
controller.ShowComplain(); controller.ShowComplain();
controller.ChangeCustomerState(CustomerState.Leave); controller.ChangeCustomerState(CustomerState.SadLeave);
}); });
dontBuyCustomerList.Add(controller); dontBuyCustomerList.Add(controller);
continue; continue;