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

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-12-03 16:52:36 +09:00
parent 9db62d51a3 c4c1f3ae71
commit fc6f51c58c
8 changed files with 2113 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller
View File

@ -68,13 +68,16 @@ AnimatorStateMachine:
m_Position: {x: 310, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 2248593463434949668}
m_Position: {x: 350, y: 190, z: 0}
m_Position: {x: 350, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: 3603799768492295907}
m_Position: {x: 400, y: 340, z: 0}
m_Position: {x: 400, y: 420, z: 0}
- serializedVersion: 1
m_State: {fileID: -5442313241527987121}
m_Position: {x: 380, y: 270, z: 0}
m_Position: {x: 380, y: 350, z: 0}
- serializedVersion: 1
m_State: {fileID: 914737976247534988}
m_Position: {x: 330, y: 560, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 6442717320784534736}
@ -156,31 +159,31 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Open
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: CleaningA
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: CleaningB
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: MoveSideways
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -219,6 +222,32 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &914737976247534988
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_blue_MoveSideways
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8b6d6dc1741234719808a06428753f0f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &1763129385586290165
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -277,7 +306,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_blue_MoveSideways
m_Name: Brother_blue_cleaning_c
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@ -290,7 +319,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8b6d6dc1741234719808a06428753f0f, type: 2}
m_Motion: {fileID: 7400000, guid: 44376049858e1415bae1c7f691f0d1ec, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:

20
popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim
View File

@ -19,7 +19,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.53300005, y: -0.846, z: 32.213}
value: {x: 0.215, y: -0.97700006, z: 12.407001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -28,7 +28,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.96666664
value: {x: 0.53300005, y: -0.846, z: 51.659004}
value: {x: 0.53300005, y: -0.846, z: 17.220491}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -37,7 +37,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 3
value: {x: 0.53300005, y: -0.846, z: 32.213}
value: {x: 0.215, y: -0.97700006, z: 12.407001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -652,7 +652,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.53300005
value: 0.215
inSlope: 0
outSlope: 0
tangentMode: 136
@ -670,7 +670,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.53300005
value: 0.215
inSlope: 0
outSlope: 0
tangentMode: 136
@ -689,7 +689,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.846
value: -0.97700006
inSlope: 0
outSlope: 0
tangentMode: 136
@ -707,7 +707,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: -0.846
value: -0.97700006
inSlope: 0
outSlope: 0
tangentMode: 136
@ -726,7 +726,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 32.213
value: 12.407001
inSlope: 0
outSlope: 0
tangentMode: 136
@ -735,7 +735,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.96666664
value: 51.659004
value: 17.220491
inSlope: 0
outSlope: 0
tangentMode: 136
@ -744,7 +744,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 32.213
value: 12.407001
inSlope: 0
outSlope: 0
tangentMode: 136

12
popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim
View File

@ -224,7 +224,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5166667
time: 1.5
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -445,7 +445,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity
@ -1604,7 +1604,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5166667
time: 1.5
value: 0
inSlope: 0
outSlope: 0
@ -1650,7 +1650,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5166667
time: 1.5
value: 0
inSlope: 0
outSlope: 0
@ -1696,7 +1696,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5166667
time: 1.5
value: 0
inSlope: 0
outSlope: 0
@ -1761,7 +1761,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity

1926
popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 44376049858e1415bae1c7f691f0d1ec
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

64
popcorn/Assets/MyGame/Resource/Animation/closed_siqnboard.anim
View File

@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.38, z: 0}
value: {x: 0, y: -0.29, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: 0, y: 0, z: 0}
value: {x: 0, y: -0.69, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -114,6 +114,34 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: signboard
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
@ -147,7 +175,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.38
value: -0.29
inSlope: 0
outSlope: 0
tangentMode: 136
@ -156,7 +184,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
value: -0.69
inSlope: 0
outSlope: 0
tangentMode: 136
@ -198,34 +226,6 @@ AnimationClip:
path: signboard
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: signboard
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

BIN
popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_item_a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

97
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -566,7 +566,8 @@ Transform:
m_LocalRotation: {x: -0, y: -0.008727774, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0.45, y: -0.091, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 708142970}
m_Father: {fileID: 286834612}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: -1, z: 0}
@ -3007,7 +3008,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 668553842}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: -0.69, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1199276395}
@ -3380,6 +3381,87 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &708142969
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 708142970}
- component: {fileID: 708142971}
m_Layer: 0
m_Name: left_c_p (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &708142970
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 708142969}
m_LocalRotation: {x: 0.00044996565, y: 0.008716168, z: 0.05155364, w: 0.99863213}
m_LocalPosition: {x: 0.4079568, y: -0.35089907, z: -0.31922168}
m_LocalScale: {x: -1, y: 1, z: 1.25}
m_Children: []
m_Father: {fileID: 151001428}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 57.367004}
--- !u!212 &708142971
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 708142969}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 30
m_Sprite: {fileID: 21300000, guid: 3b2af36eaeaff5c459042ec3842e2260, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.84, y: 1.14}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &713264522
PrefabInstance:
m_ObjectHideFlags: 0
@ -3894,6 +3976,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 274
objectReference: {fileID: 0}
- target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
@ -6346,7 +6433,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1199276394}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.94, z: 0}
m_LocalPosition: {x: 0, y: 1.11, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 668553843}
@ -8022,7 +8109,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1603646714}
m_LocalRotation: {x: -0, y: -0, z: 0.102078564, w: 0.9947763}
m_LocalPosition: {x: 0.39, y: -0.47, z: 0.10000002}
m_LocalPosition: {x: 0.39, y: -0.47, z: 0.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1026166059}
@ -14222,7 +14309,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1866866950}
m_LocalRotation: {x: -0, y: -0, z: 0.1947258, w: 0.98085773}
m_LocalPosition: {x: 0.66, y: 3.05, z: -0.17762177}
m_LocalPosition: {x: 1.16, y: 2.84, z: -0.17762177}
m_LocalScale: {x: 1.1998432, y: 1.1699773, z: 1.1869801}
m_Children: []
m_Father: {fileID: 443832894}