From 7861b7b82826778c4ac49f18a6013e184c139a4e Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 14 Oct 2021 11:22:06 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=83=99=E3=83=AB=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97Pop=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Brother_Blue_conversation.controller | 276 +++++++++++++++- .../Brother_pink_conversation.controller | 271 +++++++++++++--- .../MyGame/Resources/Data/DownloadDate.txt | 2 +- .../MyGame/Resources/Data/ScriptData.txt | 1 + .../MyGame/Resources/Data/ScriptData.txt.meta | 7 + .../Prefabs/Conversation/Canvas.prefab | 304 +++++++++++++----- .../marketing/Prefabs/ShopLevel/Canvas.prefab | 21 +- .../marketing/Scripts/BrotherConversation.cs | 83 +++++ .../Scripts/BrotherConversation.cs.meta | 3 + .../Scenes/marketing/Scripts/ShopLevelUp.cs | 46 +++ .../marketing/Scripts/ShopLevelUp.cs.meta | 3 + .../Scenes/marketing/conversation.unity | 5 + popcorn/Assets/MyGame/Scripts/Const.cs | 2 + .../Assets/MyGame/Scripts/SpreadsheetData.cs | 44 ++- .../MyGame/Scripts/TransitionManager.cs | 2 +- 15 files changed, 931 insertions(+), 139 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resources/Data/ScriptData.txt create mode 100644 popcorn/Assets/MyGame/Resources/Data/ScriptData.txt.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs.meta diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_conversation.controller b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_conversation.controller index 7737a610..044b9692 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_conversation.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_conversation.controller @@ -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 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_conversation.controller b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_conversation.controller index ed3cea50..463ac415 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_conversation.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_conversation.controller @@ -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 diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index 4c1c97c7..6d44fdba 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -/zrZmMLhN6AdOBkqJoLmcEPk1meOGcrXRw3+pwLYx1FYtTuZpezgTnaJ43CUvrrB \ No newline at end of file +wOwOWOpFTF81a2W6eVCczUN68fkQDTy0VHi71jNAoZ9mATKUApCNJGNvaQAaa7q5 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ScriptData.txt b/popcorn/Assets/MyGame/Resources/Data/ScriptData.txt new file mode 100644 index 00000000..a8ef6e5b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Data/ScriptData.txt @@ -0,0 +1 @@ +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 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ScriptData.txt.meta b/popcorn/Assets/MyGame/Resources/Data/ScriptData.txt.meta new file mode 100644 index 00000000..ff05ae66 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Data/ScriptData.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5ae63b21e5c9149a9a2b00ae302f0a7c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab index 03a21fbc..22e2cdef 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab @@ -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} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab index 6ced0ab3..12b86a68 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab @@ -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: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs new file mode 100644 index 00000000..b576e9e1 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs @@ -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(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(); + } + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs.meta new file mode 100644 index 00000000..439eef01 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 444b14e2428a474fac0057afa38e6aed +timeCreated: 1634102872 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs new file mode 100644 index 00000000..af836170 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -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(Const.ProductDataSheet); + var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(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); + }); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs.meta new file mode 100644 index 00000000..82e99ca9 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 32f78ea62bab4a8783c0c99d71bdb6b0 +timeCreated: 1634100791 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity index 92486fda..8aadd292 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity @@ -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 diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index 039cbb3a..1516bded 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -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"), diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index cffd698c..408d2f5a 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -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] diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs index 2b13a414..d1bde91e 100644 --- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs @@ -27,7 +27,7 @@ public enum GameScenes BulkOrderAchievement, BulkOrderCancel, BulkOrderTelephone, - ShopLevel, + StoreLevel, Conversation, SettingsDialog, DebugOption,