レベルアップPop処理追加

This commit is contained in:
kimura 2021-10-14 11:22:06 +09:00
parent a29d1790d2
commit 7861b7b828
15 changed files with 931 additions and 139 deletions

View File

@ -1,5 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8731171834836545595
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: Tired
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5536275497640999052}
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 &-7488468259963136650
AnimatorState:
serializedVersion: 5
@ -104,6 +129,81 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4778382325215610915
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: Happy
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4781809722394448932}
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!1101 &-4638771995395337846
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: Surprise
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7488468259963136650}
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!1101 &-4626931557314645210
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: Cheer
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6472737671434878787}
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 &-2958130446930149254
AnimatorState:
serializedVersion: 5
@ -156,6 +256,56 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-977272382150057075
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: Sweat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2176240188318956398}
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!1101 &-337701437555374601
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: Normal
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5909828885173387295}
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!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -164,7 +314,55 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: Brother_Blue_conversation
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Normal
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Tired
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Surprise
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: CloseEye
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Question
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Cheer
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Happy
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Sweat
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -178,6 +376,31 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1725670059505390342
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: Question
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2958130446930149254}
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!1107 &2646158403870741878
AnimatorStateMachine:
serializedVersion: 5
@ -189,30 +412,38 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -5909828885173387295}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 280, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: -5536275497640999052}
m_Position: {x: 235, y: 65, z: 0}
m_Position: {x: 320, y: 70, z: 0}
- serializedVersion: 1
m_State: {fileID: -7488468259963136650}
m_Position: {x: 270, y: 130, z: 0}
m_Position: {x: 350, y: 140, z: 0}
- serializedVersion: 1
m_State: {fileID: 7476757865585147909}
m_Position: {x: 305, y: 195, z: 0}
m_Position: {x: 390, y: 200, z: 0}
- serializedVersion: 1
m_State: {fileID: -2958130446930149254}
m_Position: {x: 340, y: 260, z: 0}
m_Position: {x: 420, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: 6472737671434878787}
m_Position: {x: 375, y: 325, z: 0}
m_Position: {x: 460, y: 330, z: 0}
- serializedVersion: 1
m_State: {fileID: -4781809722394448932}
m_Position: {x: 410, y: 390, z: 0}
m_Position: {x: 490, y: 400, z: 0}
- serializedVersion: 1
m_State: {fileID: -2176240188318956398}
m_Position: {x: 445, y: 455, z: 0}
m_Position: {x: 530, y: 460, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_AnyStateTransitions:
- {fileID: -337701437555374601}
- {fileID: -8731171834836545595}
- {fileID: -4638771995395337846}
- {fileID: 7562786166012412282}
- {fileID: 1725670059505390342}
- {fileID: -4626931557314645210}
- {fileID: -4778382325215610915}
- {fileID: -977272382150057075}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@ -273,3 +504,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &7562786166012412282
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: CloseEye
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7476757865585147909}
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

View File

@ -78,6 +78,81 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-7249007069766440564
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: Question
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7562491579470640720}
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!1101 &-7151287652010877602
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: Smile
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8210209834875913552}
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!1101 &-6143916097733581937
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: Sweat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -28000313973252299}
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 &-5936583560518822250
AnimatorState:
serializedVersion: 5
@ -104,32 +179,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-5388322875874369750
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_blue_conversation_Sweat
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-4606729207650835417
AnimatorStateMachine:
serializedVersion: 5
@ -141,30 +190,34 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -7381733986077229037}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 290, y: 20, z: 0}
- serializedVersion: 1
m_State: {fileID: 8210209834875913552}
m_Position: {x: 235, y: 65, z: 0}
m_Position: {x: 320, y: 90, z: 0}
- serializedVersion: 1
m_State: {fileID: 2474717641823443166}
m_Position: {x: 270, y: 130, z: 0}
m_Position: {x: 360, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -7352953022492696501}
m_Position: {x: 305, y: 195, z: 0}
m_Position: {x: 390, y: 220, z: 0}
- serializedVersion: 1
m_State: {fileID: -5936583560518822250}
m_Position: {x: 340, y: 260, z: 0}
- serializedVersion: 1
m_State: {fileID: -5388322875874369750}
m_Position: {x: 375, y: 325, z: 0}
m_Position: {x: 430, y: 280, z: 0}
- serializedVersion: 1
m_State: {fileID: -7562491579470640720}
m_Position: {x: 410, y: 390, z: 0}
m_Position: {x: 460, y: 350, z: 0}
- serializedVersion: 1
m_State: {fileID: -28000313973252299}
m_Position: {x: 445, y: 455, z: 0}
m_Position: {x: 490, y: 420, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_AnyStateTransitions:
- {fileID: 6855756091759248549}
- {fileID: -7151287652010877602}
- {fileID: 7991656206438554390}
- {fileID: 8753057445336917165}
- {fileID: -2090701752135186709}
- {fileID: -7249007069766440564}
- {fileID: -6143916097733581937}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@ -173,6 +226,31 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -7381733986077229037}
--- !u!1101 &-2090701752135186709
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: Happy
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5936583560518822250}
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 &-28000313973252299
AnimatorState:
serializedVersion: 5
@ -207,7 +285,49 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: Brother_pink_conversation
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Normal
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Smile
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Surprise
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Cheer
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Happy
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Sweat
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Question
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -247,6 +367,56 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &6855756091759248549
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: Normal
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7381733986077229037}
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!1101 &7991656206438554390
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: Surprise
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2474717641823443166}
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 &8210209834875913552
AnimatorState:
serializedVersion: 5
@ -273,3 +443,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8753057445336917165
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: Cheer
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7352953022492696501}
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

View File

@ -1 +1 @@
/zrZmMLhN6AdOBkqJoLmcEPk1meOGcrXRw3+pwLYx1FYtTuZpezgTnaJ43CUvrrB
wOwOWOpFTF81a2W6eVCczUN68fkQDTy0VHi71jNAoZ9mATKUApCNJGNvaQAaa7q5

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5ae63b21e5c9149a9a2b00ae302f0a7c
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,117 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2144687251541129999
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4879042289721963622}
- component: {fileID: 5271410145092495927}
m_Layer: 5
m_Name: SubCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4879042289721963622
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2144687251541129999}
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_Children:
- {fileID: 8326132141119378160}
m_Father: {fileID: 8326132141332391088}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -400}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &5271410145092495927
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2144687251541129999}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 98
m_TargetDisplay: 0
--- !u!1 &5592114711265303720
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2381371358952647535}
- component: {fileID: 3224305224086938660}
m_Layer: 5
m_Name: Manager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2381371358952647535
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5592114711265303720}
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_Children: []
m_Father: {fileID: 8326132141332391088}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3224305224086938660
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5592114711265303720}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 444b14e2428a474fac0057afa38e6aed, type: 3}
m_Name:
m_EditorClassIdentifier:
backgroundAnimator: {fileID: 8326132141119378161}
brotherBlueAnimator: {fileID: 8326132142743140528}
brotherPinkAnimator: {fileID: 8326132141884556188}
blueNameObject: {fileID: 8326132142916714446}
pinkNameObject: {fileID: 8326132141718845782}
brotherText: {fileID: 8326132142784757741}
--- !u!1 &8326132140880132230
GameObject:
m_ObjectHideFlags: 0
@ -8,16 +120,17 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8326132140880132231}
m_Layer: 0
- component: {fileID: 6037241954041377766}
- component: {fileID: 815006322331070093}
m_Layer: 5
m_Name: Brother
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8326132140880132231
Transform:
--- !u!224 &6037241954041377766
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -29,9 +142,25 @@ Transform:
m_Children:
- {fileID: 8326132142743140535}
- {fileID: 8326132141884556179}
m_Father: {fileID: 8326132141332391088}
m_Father: {fileID: 8326132142314805032}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 537}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!210 &815006322331070093
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8326132140880132230}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 99
--- !u!1 &8326132140883042584
GameObject:
m_ObjectHideFlags: 0
@ -43,7 +172,7 @@ GameObject:
- component: {fileID: 8326132140883042585}
- component: {fileID: 8326132140883042586}
- component: {fileID: 8326132140883042587}
m_Layer: 0
m_Layer: 5
m_Name: Question
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -144,7 +273,7 @@ GameObject:
- component: {fileID: 8326132140921411082}
- component: {fileID: 8326132140921411083}
- component: {fileID: 8326132140921411124}
m_Layer: 0
m_Layer: 5
m_Name: smile
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -244,7 +373,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132140991209733}
- component: {fileID: 8326132140991209734}
m_Layer: 0
m_Layer: 5
m_Name: right_a
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -324,7 +453,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141071550353}
m_Layer: 0
m_Layer: 5
m_Name: mouth
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -373,11 +502,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8326132141119378167}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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_Children: []
m_Father: {fileID: 8326132141995297681}
m_Father: {fileID: 4879042289721963622}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -451,7 +580,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141132956796}
- component: {fileID: 8326132141132956797}
m_Layer: 0
m_Layer: 5
m_Name: left_a
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -532,7 +661,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141152000588}
- component: {fileID: 8326132141152000589}
m_Layer: 0
m_Layer: 5
m_Name: right_Pencil
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -687,7 +816,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141267954184}
- component: {fileID: 8326132141267954185}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -768,7 +897,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141296539806}
- component: {fileID: 8326132141296539807}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -850,7 +979,7 @@ GameObject:
- component: {fileID: 8326132141302094844}
- component: {fileID: 8326132141302094845}
- component: {fileID: 8326132141302094846}
m_Layer: 0
m_Layer: 5
m_Name: astonishment
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -970,8 +1099,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 8326132140880132231}
- {fileID: 4879042289721963622}
- {fileID: 8326132141995297681}
- {fileID: 2381371358952647535}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1050,7 +1180,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141334795079}
- component: {fileID: 8326132141334795072}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1131,7 +1261,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141385936841}
- component: {fileID: 8326132141385936842}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1211,7 +1341,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141478229069}
m_Layer: 0
m_Layer: 5
m_Name: close
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1264,7 +1394,7 @@ RectTransform:
- {fileID: 8326132142300238826}
- {fileID: 8326132141155418813}
m_Father: {fileID: 8326132142314805032}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1281,7 +1411,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141504684791}
- component: {fileID: 8326132141504684784}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1362,7 +1492,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141510797058}
- component: {fileID: 8326132141510797059}
m_Layer: 0
m_Layer: 5
m_Name: up
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1443,7 +1573,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141567865694}
- component: {fileID: 8326132141567865695}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1524,7 +1654,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141571715827}
- component: {fileID: 8326132141571715836}
m_Layer: 0
m_Layer: 5
m_Name: body
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1605,7 +1735,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141572153108}
- component: {fileID: 8326132141572153109}
m_Layer: 0
m_Layer: 5
m_Name: body
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1686,7 +1816,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141577481189}
- component: {fileID: 8326132141577481190}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1766,7 +1896,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141606188411}
m_Layer: 0
m_Layer: 5
m_Name: tired
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1800,7 +1930,7 @@ GameObject:
- component: {fileID: 8326132141608364540}
- component: {fileID: 8326132141608364541}
- component: {fileID: 8326132141608364542}
m_Layer: 0
m_Layer: 5
m_Name: Sweat
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1899,7 +2029,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141641515377}
m_Layer: 0
m_Layer: 5
m_Name: eye
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1934,7 +2064,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141676049585}
- component: {fileID: 8326132141676049586}
m_Layer: 0
m_Layer: 5
m_Name: up
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2015,7 +2145,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141698139126}
- component: {fileID: 8326132141698139127}
m_Layer: 0
m_Layer: 5
m_Name: left_c
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2096,7 +2226,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141715923810}
- component: {fileID: 8326132141715923811}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2251,7 +2381,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141724331754}
- component: {fileID: 8326132141724331755}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2331,7 +2461,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141744221205}
m_Layer: 0
m_Layer: 5
m_Name: pink
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2368,7 +2498,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141749845573}
- component: {fileID: 8326132141749845574}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2448,7 +2578,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141777197485}
m_Layer: 0
m_Layer: 5
m_Name: tired
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2480,7 +2610,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141795236621}
m_Layer: 0
m_Layer: 5
m_Name: AnimationPivot_Blue
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2512,7 +2642,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141810833632}
- component: {fileID: 8326132141810833633}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2593,7 +2723,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141818718234}
- component: {fileID: 8326132141818718235}
m_Layer: 0
m_Layer: 5
m_Name: 'right '
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2673,7 +2803,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141840838975}
m_Layer: 0
m_Layer: 5
m_Name: ef
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2707,13 +2837,13 @@ GameObject:
m_Component:
- component: {fileID: 8326132141884556179}
- component: {fileID: 8326132141884556188}
m_Layer: 0
m_Layer: 5
m_Name: Brother_pink
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &8326132141884556179
Transform:
m_ObjectHideFlags: 0
@ -2726,7 +2856,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8326132142831832561}
m_Father: {fileID: 8326132140880132231}
m_Father: {fileID: 6037241954041377766}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &8326132141884556188
@ -2759,7 +2889,7 @@ GameObject:
- component: {fileID: 8326132141892762133}
- component: {fileID: 8326132141892762134}
- component: {fileID: 8326132141892762135}
m_Layer: 0
m_Layer: 5
m_Name: Sweat
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2859,7 +2989,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141911565869}
- component: {fileID: 8326132141911565870}
m_Layer: 0
m_Layer: 5
m_Name: right_c
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2939,7 +3069,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132141925733320}
m_Layer: 0
m_Layer: 5
m_Name: wing
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2974,7 +3104,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141932638737}
- component: {fileID: 8326132141932638738}
m_Layer: 0
m_Layer: 5
m_Name: down
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3055,7 +3185,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132141974393004}
- component: {fileID: 8326132141974393005}
m_Layer: 0
m_Layer: 5
m_Name: back
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3153,7 +3283,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8326132141119378160}
- {fileID: 8326132142314805032}
m_Father: {fileID: 8326132141332391088}
m_RootOrder: 1
@ -3172,7 +3301,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142014058222}
m_Layer: 0
m_Layer: 5
m_Name: ef
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3207,7 +3336,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142018351619}
- component: {fileID: 8326132142018351628}
m_Layer: 0
m_Layer: 5
m_Name: down
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3288,7 +3417,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142026856298}
- component: {fileID: 8326132142026856299}
m_Layer: 0
m_Layer: 5
m_Name: left_tired
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3369,7 +3498,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142028446233}
- component: {fileID: 8326132142028446234}
m_Layer: 0
m_Layer: 5
m_Name: right_a
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3451,7 +3580,7 @@ GameObject:
- component: {fileID: 8326132142047786581}
- component: {fileID: 8326132142047786582}
- component: {fileID: 8326132142047786583}
m_Layer: 0
m_Layer: 5
m_Name: astonishment
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3550,7 +3679,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142065893224}
m_Layer: 0
m_Layer: 5
m_Name: Blue
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3586,7 +3715,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142089885687}
m_Layer: 0
m_Layer: 5
m_Name: normal
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3618,7 +3747,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142100206111}
m_Layer: 0
m_Layer: 5
m_Name: mouth
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3651,7 +3780,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142103454340}
- component: {fileID: 8326132142103454341}
m_Layer: 0
m_Layer: 5
m_Name: 'left '
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3731,7 +3860,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142129191921}
m_Layer: 0
m_Layer: 5
m_Name: astonishment
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3764,7 +3893,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142168276542}
- component: {fileID: 8326132142168276543}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3845,7 +3974,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142198031912}
- component: {fileID: 8326132142198031913}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3946,7 +4075,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8326132142314805032}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4000,7 +4129,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142207212057}
- component: {fileID: 8326132142207212058}
m_Layer: 0
m_Layer: 5
m_Name: front
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4081,7 +4210,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142228314398}
- component: {fileID: 8326132142228314399}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4162,7 +4291,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142233745816}
- component: {fileID: 8326132142233745817}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4317,7 +4446,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142304899112}
- component: {fileID: 8326132142304899113}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4416,12 +4545,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6037241954041377766}
- {fileID: 8326132141479287345}
- {fileID: 8326132142204441741}
- {fileID: 8326132142784757740}
- {fileID: 8326132142488478140}
m_Father: {fileID: 8326132141995297681}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -4451,7 +4581,7 @@ GameObject:
- component: {fileID: 8326132142376114442}
- component: {fileID: 8326132142376114443}
- component: {fileID: 8326132142376114484}
m_Layer: 0
m_Layer: 5
m_Name: Question
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4551,7 +4681,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142418878643}
- component: {fileID: 8326132142418878652}
m_Layer: 0
m_Layer: 5
m_Name: left_a
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4631,7 +4761,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142419760717}
m_Layer: 0
m_Layer: 5
m_Name: leg
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4663,7 +4793,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142471785827}
m_Layer: 0
m_Layer: 5
m_Name: eye
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4719,7 +4849,7 @@ RectTransform:
- {fileID: 8326132142916714447}
- {fileID: 8326132141718845783}
m_Father: {fileID: 8326132142314805032}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4735,7 +4865,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142516391795}
m_Layer: 0
m_Layer: 5
m_Name: wing
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4774,7 +4904,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142529065749}
- component: {fileID: 8326132142529065750}
m_Layer: 0
m_Layer: 5
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4855,7 +4985,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142542952804}
- component: {fileID: 8326132142542952805}
m_Layer: 0
m_Layer: 5
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4936,7 +5066,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142635387048}
- component: {fileID: 8326132142635387049}
m_Layer: 0
m_Layer: 5
m_Name: body_FeelSick
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5016,7 +5146,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142672591604}
m_Layer: 0
m_Layer: 5
m_Name: close
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5049,7 +5179,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142698926958}
- component: {fileID: 8326132142698926959}
m_Layer: 0
m_Layer: 5
m_Name: right_b
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5130,7 +5260,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142743140535}
- component: {fileID: 8326132142743140528}
m_Layer: 0
m_Layer: 5
m_Name: Brother_Blue
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5149,7 +5279,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8326132141795236621}
m_Father: {fileID: 8326132140880132231}
m_Father: {fileID: 6037241954041377766}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &8326132142743140528
@ -5180,7 +5310,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142750289216}
m_Layer: 0
m_Layer: 5
m_Name: Smile
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5212,7 +5342,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142758377141}
m_Layer: 0
m_Layer: 5
m_Name: astonishment
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5265,7 +5395,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8326132142314805032}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -5323,7 +5453,7 @@ GameObject:
m_Component:
- component: {fileID: 8326132142799556441}
- component: {fileID: 8326132142799556442}
m_Layer: 0
m_Layer: 5
m_Name: right_tired
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5403,7 +5533,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142810994932}
m_Layer: 0
m_Layer: 5
m_Name: normal
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5435,7 +5565,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8326132142831832561}
m_Layer: 0
m_Layer: 5
m_Name: AnimationPivot_pink
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@ -10854,6 +10854,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8660695105516013787}
- component: {fileID: 4230572944064286779}
m_Layer: 5
m_Name: Window
m_TagString: Untagged
@ -10882,6 +10883,24 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -280}
m_SizeDelta: {x: 850, y: 700}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4230572944064286779
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8660695105516013788}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32f78ea62bab4a8783c0c99d71bdb6b0, type: 3}
m_Name:
m_EditorClassIdentifier:
backgroundAnimator: {fileID: 8660695105907544097}
shopLevelText: {fileID: 8660695105455363541}
achievementText: {fileID: 8660695104801603081}
recipeNameText: {fileID: 8660695105669835445}
closeButton: {fileID: 8660695104385436398}
summaryObject: {fileID: 8660695104506343187}
--- !u!1 &8660695105553703394
GameObject:
m_ObjectHideFlags: 0
@ -11268,7 +11287,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.19607843}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UniRx;
using UniRx.Triggers;
using UnityEngine;
using UnityEngine.UI;
public class BrotherConversation : MonoBehaviour
{
private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger");
private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger");
[SerializeField] private Animator backgroundAnimator;
[SerializeField] private Animator brotherBlueAnimator;
[SerializeField] private Animator brotherPinkAnimator;
[SerializeField] private GameObject blueNameObject;
[SerializeField] private GameObject pinkNameObject;
[SerializeField] private Text brotherText;
private void Start()
{
// レベルからスクリプト読み込み
var level = 5;
var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelScriptData>(Const.ScriptDataSheet);
var targetScriptList = scriptList.Where(data => data.id == level).ToList();
var clickCountStream = this.UpdateAsObservable()
.Select(_ => Input.GetMouseButton(0))
.DistinctUntilChanged()
.Skip(1)
.Where(b => b)
.ThrottleFirst(TimeSpan.FromSeconds(.25f))
.Select(_ => 1)
.Scan((i, i1) => i + i1);
clickCountStream
.TakeWhile(x => x < targetScriptList.Count)
.Select(x => targetScriptList[x])
.Subscribe(data =>
{
SetData(data);
}, () =>
{
transform.SetLocalScale(0);
backgroundAnimator.SetTrigger(CloseTrigger);
this.CallWaitForSeconds(.25f, () =>
{
TransitionManager.Instance.UnloadScene(GameScenes.Conversation);
});
}).AddTo(this);
SetData(targetScriptList[0]);
}
// ここチュートリアルでも使えるようにDataClass切りたい
private void SetData(ShopLevelScriptData scriptData)
{
Debug.Log($"{scriptData.BlueFace.ToString()}, {scriptData.PinkFace.ToString()}");
brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString());
brotherPinkAnimator.SetTrigger(scriptData.PinkFace.ToString());
brotherText.text = scriptData.text;
switch (scriptData.Brother)
{
case BrotherType.Blue:
brotherBlueAnimator.transform.SetLocalScale(1f);
brotherPinkAnimator.transform.SetLocalScale(0f);
blueNameObject.SetActive(true);
pinkNameObject.SetActive(false);
break;
case BrotherType.Pink:
brotherBlueAnimator.transform.SetLocalScale(0f);
brotherPinkAnimator.transform.SetLocalScale(1f);
blueNameObject.SetActive(false);
pinkNameObject.SetActive(true);
break;
case BrotherType.Both:
break;
default:
throw new ArgumentOutOfRangeException();
}
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 444b14e2428a474fac0057afa38e6aed
timeCreated: 1634102872

View File

@ -0,0 +1,46 @@
using System;
using System.Linq;
using TMPro;
using UniRx;
using UnityEngine;
using UnityEngine.UI;
public class ShopLevelUp : MonoBehaviour
{
private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger");
private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger");
[SerializeField] private Animator backgroundAnimator;
[SerializeField] private TextMeshProUGUI shopLevelText;
[SerializeField] private Text achievementText;
[SerializeField] private Text recipeNameText;
[SerializeField] private Button closeButton;
[SerializeField] private GameObject summaryObject;
private void Start()
{
closeButton.OnClickAsObservable().Subscribe(_ =>
{
transform.SetLocalScale(0);
backgroundAnimator.SetTrigger(CloseTrigger);
this.CallWaitForSeconds(.25f, () =>
{
TransitionManager.Instance.UnloadScene(GameScenes.StoreLevel);
TransitionManager.Instance.LoadSceneAdditive(GameScenes.Conversation);
});
}).AddTo(this);
var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
var shopLevel = 5;
shopLevelText.text = shopLevel.ToString();
achievementText.text = shopLevelList.First(data => data.shopLevel == shopLevel).achievement;
recipeNameText.text = productList.First(data => data.shopLevel == shopLevel).name;
summaryObject.SetActive(false);
this.CallWaitForSeconds(1f, () =>
{
summaryObject.SetActive(true);
});
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 32f78ea62bab4a8783c0c99d71bdb6b0
timeCreated: 1634100791

View File

@ -188,6 +188,11 @@ PrefabInstance:
propertyPath: m_Name
value: UICamera
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3}
--- !u!20 &2042574237 stripped

View File

@ -38,6 +38,7 @@ public static class Const {
public static readonly string MissionDataSheet = "MissionData";
public static readonly string BulkOrderDataSheet = "BulkOrderData";
public static readonly string BulkOrderTextDataSheet = "BulkOrderTextData";
public static readonly string ScriptDataSheet = "ScriptData";
// language
public static readonly string LangJapanDataSheet = "LangJapanData";
@ -69,6 +70,7 @@ public static class Const {
new SheetData(Const.MissionDataSheet),
new SheetData(Const.BulkOrderDataSheet),
new SheetData(Const.BulkOrderTextDataSheet),
new SheetData(Const.ScriptDataSheet),
};
public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{
new SheetData(Const.LangJapanDataSheet, "LanguageData"),

View File

@ -63,6 +63,36 @@ public enum MissionRewardType
Coin = 1,
}
public enum BlueFaceType
{
Normal = 1,
CloseEye = 2,
Happy = 3,
Cheer = 4,
Sweat = 5,
Question = 6,
Surprise = 7,
Tired = 8,
}
public enum PinkFaceType
{
Normal = 1,
Smile = 2,
Happy = 3,
Cheer = 4,
Sweat = 5,
Question = 6,
Surprise = 7,
}
public enum BrotherType
{
Blue = 1,
Pink = 2,
Both = 3,
}
[Serializable]
public sealed class MissionData
{
@ -259,8 +289,20 @@ public sealed class ShopLevelData
public int shopLevel;
public int heart;
public int customer;
public int achievement;
public string achievement;
}
[Serializable]
public sealed class ShopLevelScriptData
{
public int id;
public string text;
public int brother;
public int blueFace;
public int pinkFace;
public BrotherType Brother => (BrotherType) brother;
public BlueFaceType BlueFace => (BlueFaceType) blueFace;
public PinkFaceType PinkFace => (PinkFaceType) pinkFace;
}
[Serializable]

View File

@ -27,7 +27,7 @@ public enum GameScenes
BulkOrderAchievement,
BulkOrderCancel,
BulkOrderTelephone,
ShopLevel,
StoreLevel,
Conversation,
SettingsDialog,
DebugOption,