Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
This commit is contained in:
koya_15
commit
3e5ef59b99
|
|
@ -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: []
|
||||
|
|
|
|||
|
|
@ -121,6 +121,147 @@ NavMeshSettings:
|
|||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1001 &153639483
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 785180939}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u5546\u54C1\n\u88DC\u5145\u5C11"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RefillLittleProduct
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3}
|
||||
--- !u!114 &153639484 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 153639483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &450754451
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -243,6 +384,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: FieldResetButton
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3}
|
||||
--- !u!114 &450754452 stripped
|
||||
|
|
@ -335,7 +481,7 @@ GameObject:
|
|||
- component: {fileID: 744739668}
|
||||
- component: {fileID: 744739667}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_Name: Toggles
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -353,12 +499,14 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1998240840}
|
||||
- {fileID: 1074704276}
|
||||
- {fileID: 839487031}
|
||||
m_Father: {fileID: 785180938}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -144}
|
||||
m_AnchoredPosition: {x: 186.4, y: -90}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &744739667
|
||||
|
|
@ -527,6 +675,26 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2541661408982824306, guid: 32f8e8f0ced494daeb0f218e6be9d9db,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2541661409141469742, guid: 32f8e8f0ced494daeb0f218e6be9d9db,
|
||||
type: 3}
|
||||
propertyPath: m_Constraint
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2541661409141469742, guid: 32f8e8f0ced494daeb0f218e6be9d9db,
|
||||
type: 3}
|
||||
propertyPath: m_ConstraintCount
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2541661409648867663, guid: 32f8e8f0ced494daeb0f218e6be9d9db,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 32f8e8f0ced494daeb0f218e6be9d9db, type: 3}
|
||||
--- !u!224 &785180938 stripped
|
||||
|
|
@ -565,6 +733,436 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &839487030
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 744739666}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6737172384039791724, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u30CF\u30FC\u30C8"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 120
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6737172384967821846, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: HeartCount
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3}
|
||||
--- !u!224 &839487031 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 839487030}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &839487032 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6737172384967821842, guid: 485257dfeb2144672bcc21b704b6ca0f,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 839487030}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1074704275
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 744739666}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WalkerRushToggle
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6855072136971505580, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u6B69\u884C\u8005\u5897"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bc0b42d29ba9f4568aa0b803c18574c5, type: 3}
|
||||
--- !u!224 &1074704276 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1074704275}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1074704277 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8246534116929882156, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1074704275}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1651104559
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 785180939}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u5546\u54C1\n\u88DC\u5145\u591A"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RefillManyProduct
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3}
|
||||
--- !u!114 &1651104560 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1651104559}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1711540512
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -756,6 +1354,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: RefillButton
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3}
|
||||
--- !u!114 &1767352104 stripped
|
||||
|
|
@ -803,7 +1406,11 @@ MonoBehaviour:
|
|||
backButton: {fileID: 785180940}
|
||||
resetFieldButton: {fileID: 450754452}
|
||||
refillMaterialButton: {fileID: 1767352104}
|
||||
refillManyProductButton: {fileID: 1651104560}
|
||||
refillLittleProductButton: {fileID: 153639484}
|
||||
fastGrowingToggle: {fileID: 1998240841}
|
||||
manyWalkerToggle: {fileID: 1074704277}
|
||||
heartCount: {fileID: 839487032}
|
||||
--- !u!4 &1870432534
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -830,6 +1437,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: FastGrowingToggle
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6855072136971505580, guid: bc0b42d29ba9f4568aa0b803c18574c5,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
using System.Collections;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UniRx;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
|
@ -12,10 +14,18 @@ public class DebugOptionManager : MonoBehaviour
|
|||
[SerializeField] private Button backButton;
|
||||
[SerializeField] private Button resetFieldButton;
|
||||
[SerializeField] private Button refillMaterialButton;
|
||||
[SerializeField] private Button refillManyProductButton;
|
||||
[SerializeField] private Button refillLittleProductButton;
|
||||
[SerializeField] private Toggle fastGrowingToggle;
|
||||
[SerializeField] private Toggle manyWalkerToggle;
|
||||
[SerializeField] private InputField heartCount;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
if (!LocalCacheManager.Exists(DebugPrevSceneTag))
|
||||
{
|
||||
TransitionManager.Instance.LoadScene(GameScenes.Main);
|
||||
}
|
||||
var prevScene = LocalCacheManager.Load<GameScenes>(DebugPrevSceneTag);
|
||||
resetButton.OnClickAsObservable().Subscribe(_ =>
|
||||
{
|
||||
|
|
@ -44,6 +54,27 @@ public class DebugOptionManager : MonoBehaviour
|
|||
}
|
||||
}).AddTo(this);
|
||||
|
||||
refillManyProductButton.OnClickAsObservable().Subscribe(_ =>
|
||||
{
|
||||
gameData.ShopStock = Enumerable.Repeat(1, 10).ToList();
|
||||
gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList());
|
||||
gameData.StorageTanks[0].FlavorId = 2;
|
||||
gameData.StorageTanks[0].Stock = 50;
|
||||
}).AddTo(this);
|
||||
|
||||
refillLittleProductButton.OnClickAsObservable().Subscribe(_ =>
|
||||
{
|
||||
gameData.ShopStock = Enumerable.Repeat(2, 2).ToList();
|
||||
gameData.ShopStock = Enumerable.Repeat(1, 10).ToList();
|
||||
gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList());
|
||||
}).AddTo(this);
|
||||
|
||||
heartCount.text = $"{gameData.Heart}";
|
||||
heartCount.OnValueChangedAsObservable().Subscribe(x =>
|
||||
{
|
||||
gameData.Heart = Int32.Parse(x);
|
||||
}).AddTo(this);
|
||||
|
||||
// debugfielddata
|
||||
// gameData.PlantLines = new List<PlantLineData>
|
||||
// {
|
||||
|
|
@ -57,5 +88,10 @@ public class DebugOptionManager : MonoBehaviour
|
|||
{
|
||||
UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugFastGrowing", x);
|
||||
}).AddTo(this);
|
||||
manyWalkerToggle.isOn = UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugManyWalker", false);
|
||||
manyWalkerToggle.OnValueChangedAsObservable().Subscribe(x =>
|
||||
{
|
||||
UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugManyWalker", x);
|
||||
}).AddTo(this);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
@ -68,8 +68,7 @@ public class Market : MonoBehaviour
|
|||
|
||||
HeartMeter.Instance.Initialize(shopLevelList.Select(x => x.heart).ToList());
|
||||
HeartMeter.Instance.SetHeart(gameData.Heart);
|
||||
HeartMeter.Instance.SetHeart(99999);
|
||||
|
||||
|
||||
// 在庫数表示
|
||||
stockView.SetStock(gameData.StorageTanks);
|
||||
|
||||
|
|
@ -150,7 +149,7 @@ public class Market : MonoBehaviour
|
|||
}).AddTo(customerController);
|
||||
}).AddTo(this);
|
||||
|
||||
requestSubject.BatchFrame(30, FrameCountType.Update).Subscribe(customers =>
|
||||
requestSubject.BatchFrame().Subscribe(customers =>
|
||||
{
|
||||
if (gameData.ShopStock.Count == 0)
|
||||
{
|
||||
|
|
@ -161,7 +160,6 @@ public class Market : MonoBehaviour
|
|||
var dontBuyCustomerList = new List<CustomerController>();
|
||||
foreach (var controller in customers)
|
||||
{
|
||||
Debug.Log(shuffledOrder.Aggregate("", (s, i) => $"{s},{i}"));
|
||||
// 売り切れ
|
||||
if (shuffledOrder.Count == 0)
|
||||
{
|
||||
|
|
@ -179,7 +177,7 @@ public class Market : MonoBehaviour
|
|||
shuffledOrder.RemoveRange(0, tmpOrderCount);
|
||||
|
||||
// コーンの味吹き出しを設定(レア度優先など
|
||||
controller.ChangeWantFlavor(displayFlavors[orders.RandomChoose()]);
|
||||
controller.ShowWantFlavor(displayFlavors[orders.RandomChoose()]);
|
||||
}
|
||||
foreach (var customerController in dontBuyCustomerList)
|
||||
{
|
||||
|
|
@ -192,6 +190,10 @@ public class Market : MonoBehaviour
|
|||
|
||||
// 購入
|
||||
var flavors = orders.Select(x => (displayFlavors[x], 0)).ToList();
|
||||
#if UNITY_EDITOR
|
||||
Debug.Log($"bb order: {orders.Count} {orders.Aggregate("", (s, i) => $"{s},{i}")}");
|
||||
Debug.Log($"bb shuffledOrder:{shuffledOrder.Count} {shuffledOrder.Aggregate("", (s, i) => $"{s},{i}")}");
|
||||
#endif
|
||||
coin += SellPopcorn(flavors);
|
||||
var remainStockCount = gameData.ShopStock.Count;
|
||||
|
||||
|
|
@ -204,7 +206,6 @@ public class Market : MonoBehaviour
|
|||
if (gameData.ShopStock.Count == ShopStockCount)
|
||||
{
|
||||
shuffledOrder.AddRange(orders);
|
||||
Debug.Log($"remain {remainStockCount}, order {orders.Count}");
|
||||
var stock = gameData.ShopStock.GetRange(remainStockCount, orders.Count).ToArray();
|
||||
for (int i = 0; i < orders.Count; i++)
|
||||
{
|
||||
|
|
@ -243,6 +244,7 @@ public class Market : MonoBehaviour
|
|||
{
|
||||
foreach (var customerController in customers)
|
||||
{
|
||||
customerController.HideOrderPopup();
|
||||
var heartAnimation = customerController.GetComponent<HeartAnimation>();
|
||||
heartAnimation.GetHeart(() =>
|
||||
{
|
||||
|
|
@ -261,7 +263,26 @@ public class Market : MonoBehaviour
|
|||
}
|
||||
else if (setStockFlag)
|
||||
{
|
||||
cartView.SetStock(displayFlavors);
|
||||
#if UNITY_EDITOR
|
||||
Debug.Log($"bb setStockFlag {displayFlavors.Count} {shuffledOrder.Count}");
|
||||
#endif
|
||||
// 陳列
|
||||
cartView.ResetDisplay();
|
||||
for (int i = 0; i < displayFlavors.Count; i++)
|
||||
{
|
||||
var index = i;
|
||||
this.CallWaitForSeconds(.05f * i, () =>
|
||||
{
|
||||
if (!shuffledOrder.Contains(index))
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
Debug.Log($"bb no refill");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
cartView.Refill(index, displayFlavors[index]);
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -306,11 +327,16 @@ public class Market : MonoBehaviour
|
|||
.Do(_ => { Debug.Log($"clicked");})
|
||||
.Delay(TimeSpan.FromSeconds(2f))
|
||||
.Select(x => adWalkerObservable).Switch();
|
||||
// Observable.Timer(TimeSpan.FromSeconds(3f)).Subscribe(_ => { adClickObservable.OnNext(default); }).AddTo(this);
|
||||
#if DEVELOPMENT_BUILD || UNITY_EDITOR
|
||||
if (UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugManyWalker", false))
|
||||
{
|
||||
Observable.Timer(TimeSpan.FromSeconds(1f), TimeSpan.FromSeconds(70f)).Subscribe(_ => { adClickObservable.OnNext(default); }).AddTo(this);
|
||||
}
|
||||
#endif
|
||||
|
||||
// キャラ生成
|
||||
Observable.Merge(walkerObservable, customerObservable)
|
||||
// .Merge(adClickWalkerObservable)
|
||||
.Merge(adClickWalkerObservable)
|
||||
.Subscribe(x =>
|
||||
{
|
||||
var customer = Instantiate(customerPrefab);
|
||||
|
|
@ -332,7 +358,7 @@ public class Market : MonoBehaviour
|
|||
case CustomerMovingType.WalkBackHalf:
|
||||
waitCustomerList.Add(customerController);
|
||||
break;
|
||||
case CustomerMovingType.StayBack:
|
||||
case CustomerMovingType.StayBackOrder:
|
||||
requestSubject.OnNext(customerController);
|
||||
break;
|
||||
default:
|
||||
|
|
@ -340,19 +366,28 @@ public class Market : MonoBehaviour
|
|||
}
|
||||
}).AddTo(customerController);
|
||||
|
||||
var customerObject = customer.transform.GetChild(0).gameObject;
|
||||
if (x.isCustomer)
|
||||
{
|
||||
// 購入客リスト追加
|
||||
customerList.Add(customerController);
|
||||
if (customerObject.TryGetComponent(typeof(Collider2D), out var target))
|
||||
{
|
||||
Destroy(target);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 歩行者はタップ後購入客
|
||||
customerController.ChangeCustomerState(CustomerState.Walk);
|
||||
var eventTrigger = customer.transform.GetChild(0).gameObject.AddComponent<ObservableEventTrigger>();
|
||||
var eventTrigger = customerObject.AddComponent<ObservableEventTrigger>();
|
||||
eventTrigger.OnPointerClickAsObservable().Take(1).Subscribe(_ =>
|
||||
{
|
||||
customerList.Add(customerController);
|
||||
if (customerObject.TryGetComponent(typeof(Collider2D), out var target))
|
||||
{
|
||||
Destroy(target);
|
||||
}
|
||||
}).AddTo(customerController);
|
||||
}
|
||||
}).AddTo(this);
|
||||
|
|
@ -366,8 +401,7 @@ public class Market : MonoBehaviour
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
Debug.Log($"sellCount:{flavors.Count} {shuffledOrder.Count}");
|
||||
|
||||
|
||||
// フレーバーを売る
|
||||
var coin = 0;
|
||||
foreach (var flavorData in flavors)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ public class MarketCartView : MonoBehaviour
|
|||
{
|
||||
[SerializeField] private List<MarketPopcornView> popcornPositions;
|
||||
|
||||
private void ResetDisplay()
|
||||
public void ResetDisplay()
|
||||
{
|
||||
foreach (var popcorn in popcornPositions)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue