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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  conversationの兄の画像調整
  ポップコーン詳細POP文字サイズ、ボタン調整
  商品管理調整
  兄の街での演出追加
  ポップのボタン、お金の文字サイズ等調整
This commit is contained in:
kimura 2021-11-25 10:14:22 +09:00
commit 796f6371e1
23 changed files with 10233 additions and 477 deletions

View File

@ -7,7 +7,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_blue_cleaning_c
m_Name: Brother_blue_cleaning_b
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@ -65,16 +65,16 @@ AnimatorStateMachine:
m_Position: {x: 290, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: -2123996942653153202}
m_Position: {x: 325, y: 95, z: 0}
m_Position: {x: 360, y: 450, z: 0}
- serializedVersion: 1
m_State: {fileID: 2248593463434949668}
m_Position: {x: 320, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 3603799768492295907}
m_Position: {x: 355, y: 315, z: 0}
m_Position: {x: 390, y: 520, z: 0}
- serializedVersion: 1
m_State: {fileID: -5442313241527987121}
m_Position: {x: 390, y: 380, z: 0}
m_Position: {x: 350, y: 330, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 6442717320784534736}
@ -199,7 +199,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_blue_cleaning_b
m_Name: Brother_blue_MoveSideways
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []

View File

@ -100,49 +100,6 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimationPivot_Blue/Blue/wing/right
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: 0, z: 4.3}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 3
value: {x: 0, y: 0, z: -4.5990005}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 5
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimationPivot_Blue/Blue/mouth/down
m_PositionCurves:
- curve:
serializedVersion: 2
@ -344,13 +301,6 @@ AnimationClip:
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 3148046598
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 788391832
attribute: 3
@ -1163,144 +1113,6 @@ AnimationClip:
path: AnimationPivot_Blue/Blue/wing/right
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: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: AnimationPivot_Blue/Blue/mouth/down
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: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: AnimationPivot_Blue/Blue/mouth/down
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: 1
value: 4.3
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: -4.5990005
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: AnimationPivot_Blue/Blue/mouth/down
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
@ -1339,36 +1151,6 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: AnimationPivot_Blue/Blue/mouth/down
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: AnimationPivot_Blue/Blue/mouth/down
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimationPivot_Blue/Blue/mouth/down
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimationPivot_Blue/Blue/wing/right
classID: 4
script: {fileID: 0}
@ -1388,7 +1170,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
attribute: m_LocalEulerAngles.x
path: AnimationPivot_Blue/Blue/wing/right
classID: 4
script: {fileID: 0}

View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_blue_cleaning_c
m_Name: Brother_blue_cleaning_b
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
@ -298,6 +298,38 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimationPivot_Blue/Blue_front/wing/armPivot (1)
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 2.13, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimationPivot_Blue/Blue_front/eye
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 1.7490001, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimationPivot_Blue/Blue_front/mouth
m_ScaleCurves:
- curve:
serializedVersion: 2
@ -400,6 +432,80 @@ AnimationClip:
path: AnimationPivot_Blue/shadow_front
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.0166667
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue_front/pt_sweat
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.0166667
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue_front/pt_Smoke
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -478,6 +584,34 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3302303240
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2809721689
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 519994388
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1742361385
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2293621132
attribute: 4
@ -1614,6 +1748,194 @@ AnimationClip:
path: AnimationPivot_Blue/shadow_front
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.0166667
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue_front/pt_sweat
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.0166667
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue_front/pt_Smoke
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: AnimationPivot_Blue/Blue_front/eye
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2.13
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: AnimationPivot_Blue/Blue_front/eye
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: AnimationPivot_Blue/Blue_front/eye
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: AnimationPivot_Blue/Blue_front/mouth
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.7490001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: AnimationPivot_Blue/Blue_front/mouth
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: AnimationPivot_Blue/Blue_front/mouth
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_blue_cleaning_b
m_Name: Brother_blue_MoveSideways
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

View File

@ -151,31 +151,6 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimationPivot_Blue
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.93, y: 0.79, z: -0.1870522}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.96666664
value: {x: 1.2, y: 0.94, z: -0.18705218}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimationPivot_Blue/Blue/Effect_Sweat
m_ScaleCurves: []
m_FloatCurves:
- curve:
@ -275,7 +250,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.96666664
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
@ -287,37 +262,9 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue/Effect_Sweat
path: AnimationPivot_Blue/Blue/pt_sweat
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.96666664
value: 0.003921569
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: AnimationPivot_Blue/Blue/Effect_Sweat
classID: 212
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -333,13 +280,6 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1852547998
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2437803436
attribute: 4
@ -383,19 +323,12 @@ AnimationClip:
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1852547998
path: 808224845
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1852547998
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -941,7 +874,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.96666664
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
@ -953,121 +886,9 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: AnimationPivot_Blue/Blue/Effect_Sweat
path: AnimationPivot_Blue/Blue/pt_sweat
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.93
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.96666664
value: 1.2
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_LocalPosition.x
path: AnimationPivot_Blue/Blue/Effect_Sweat
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.79
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.96666664
value: 0.94
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_LocalPosition.y
path: AnimationPivot_Blue/Blue/Effect_Sweat
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.1870522
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.96666664
value: -0.18705218
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_LocalPosition.z
path: AnimationPivot_Blue/Blue/Effect_Sweat
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.96666664
value: 0.003921569
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: AnimationPivot_Blue/Blue/Effect_Sweat
classID: 212
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 96d284d2c6e6e4016be054a7a809f2bc
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Main_conversation_ef_Sweat
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 95a37da75f4bad246b2148e7bf311ff1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e008c7a2e829742f2bcae5ed45022ff4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -137,8 +137,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: -226.89996}
m_SizeDelta: {x: 196, y: 98}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 210, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7864277046190771846
CanvasRenderer:
@ -272,7 +272,7 @@ RectTransform:
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: 129, y: -0.39998853}
m_AnchoredPosition: {x: 129, y: 2}
m_SizeDelta: {x: 300, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7864277046289359757
@ -413,14 +413,14 @@ RectTransform:
m_GameObject: {fileID: 7864277046498279117}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
m_Children: []
m_Father: {fileID: 7864277046289359759}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 35.6, y: -37.5}
m_AnchoredPosition: {x: 38.699997, y: -37.1}
m_SizeDelta: {x: 44, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7864277046498279120
@ -787,7 +787,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 339}
m_AnchoredPosition: {x: 0, y: 114}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7864277047165460481
@ -817,7 +817,7 @@ RectTransform:
m_GameObject: {fileID: 7864277047165460481}
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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
m_Children: []
m_Father: {fileID: 7864277048159705408}
m_RootOrder: 0
@ -953,7 +953,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 173, y: -38.5}
m_AnchoredPosition: {x: 182, y: -38.9}
m_SizeDelta: {x: 180, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7864277047470455967
@ -985,11 +985,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 30
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 35
m_MinSize: 35
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@ -1032,7 +1032,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 4}
m_SizeDelta: {x: 46, y: 32}
m_SizeDelta: {x: 64, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7864277048100900071
CanvasRenderer:
@ -1061,7 +1061,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3}
m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -444,7 +444,7 @@ RectTransform:
m_GameObject: {fileID: 558600089}
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_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_Children: []
m_Father: {fileID: 2088564206}
m_RootOrder: 0
@ -473,7 +473,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3}
m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -619,7 +619,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 139.3, y: -38.5}
m_AnchoredPosition: {x: 139.3, y: -39.8}
m_SizeDelta: {x: 180, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &726079106
@ -643,11 +643,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 30
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 35
m_MinSize: 35
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@ -1150,14 +1150,14 @@ RectTransform:
m_GameObject: {fileID: 1737540868}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
m_Children: []
m_Father: {fileID: 432520475}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 35.6, y: -37.5}
m_AnchoredPosition: {x: 37.6, y: -37.5}
m_SizeDelta: {x: 44, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1737540870
@ -1414,8 +1414,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 196, y: 98}
m_AnchoredPosition: {x: 0, y: 63}
m_SizeDelta: {x: 210, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2088564207
MonoBehaviour:
@ -1639,7 +1639,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
backgroundAnimator: {fileID: 660781990}
closeButton: {fileID: 2088564207}
okButton: {fileID: 0}
messageText: {fileID: 726079106}
--- !u!1001 &8412240709702713318
PrefabInstance:

View File

@ -586,7 +586,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 4}
m_SizeDelta: {x: 46, y: 32}
m_SizeDelta: {x: 64, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1211618566
MonoBehaviour:
@ -607,7 +607,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3}
m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -756,8 +756,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 196, y: 98}
m_AnchoredPosition: {x: 0, y: 61}
m_SizeDelta: {x: 210, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1544360571
MonoBehaviour:

View File

@ -425,7 +425,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 71}
m_SizeDelta: {x: 196, y: 98}
m_SizeDelta: {x: 210, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &393391860
MonoBehaviour:
@ -793,7 +793,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 4}
m_SizeDelta: {x: 46, y: 32}
m_SizeDelta: {x: 64, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &764676372
MonoBehaviour:
@ -814,7 +814,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3}
m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -1147,7 +1147,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 295}
m_AnchoredPosition: {x: 0, y: 302}
m_SizeDelta: {x: 650, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3856012875447652418
@ -1400,7 +1400,7 @@ RectTransform:
m_GameObject: {fileID: 3856012875620007270}
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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
m_Children: []
m_Father: {fileID: 3856012876379087770}
m_RootOrder: 0
@ -1980,7 +1980,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 137}
m_SizeDelta: {x: 196, y: 98}
m_SizeDelta: {x: 210, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3856012876379087775
CanvasRenderer:
@ -3402,12 +3402,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3}
--- !u!224 &3613327422686341716 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
m_PrefabInstance: {fileID: 3856012876160759828}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5799495140018518241 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd,
@ -3420,3 +3414,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &3613327422686341716 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
m_PrefabInstance: {fileID: 3856012876160759828}
m_PrefabAsset: {fileID: 0}

View File

@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -3, y: -2}
m_SizeDelta: {x: 300, y: 138}
m_SizeDelta: {x: 300, y: 146}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1047752098345230191
CanvasRenderer:
@ -109,8 +109,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -94, y: 127.99997}
m_SizeDelta: {x: 800, y: 60}
m_AnchoredPosition: {x: -98, y: 100.99997}
m_SizeDelta: {x: 650, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7183459702793061870
CanvasRenderer:
@ -141,8 +141,8 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_FontSize: 40
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
@ -151,8 +151,8 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u3057\u3070\u3089\u304F\u306E\u9593\u304A\u5BA2\u3055\u3093\u304C\u5C11\u3057\u5897\u3048\u308B\u3088"
m_LineSpacing: 1.25
m_Text: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\u304A\u5BA2\u3055\u3093\u304C\n\u5C11\u3057\u5897\u3048\u308B\u3088"
--- !u!1 &334844612235917400
GameObject:
m_ObjectHideFlags: 0
@ -336,7 +336,7 @@ RectTransform:
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: 340, y: 0}
m_AnchoredPosition: {x: 340, y: -27}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1604830801856392308
@ -447,7 +447,7 @@ RectTransform:
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: 4}
m_AnchoredPosition: {x: 0, y: 6}
m_SizeDelta: {x: 208, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7492023257525246333
@ -521,7 +521,7 @@ RectTransform:
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: 128}
m_AnchoredPosition: {x: 0, y: 92}
m_SizeDelta: {x: 784, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4788906835824280238
@ -595,7 +595,7 @@ RectTransform:
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: -438, y: 0}
m_AnchoredPosition: {x: -441, y: -27}
m_SizeDelta: {x: 186, y: 196}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9072260743210799930
@ -669,7 +669,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -17.291}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 462, y: 55}
m_AnchoredPosition: {x: 462, y: 38}
m_SizeDelta: {x: 200, y: 178}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &615584548489827413
@ -821,7 +821,7 @@ RectTransform:
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: -38, y: -37}
m_AnchoredPosition: {x: -38, y: -87}
m_SizeDelta: {x: 700, y: 6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5879044823776041846
@ -997,7 +997,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -3, y: -2}
m_SizeDelta: {x: 300, y: 138}
m_SizeDelta: {x: 300, y: 146}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5769062584668008070
CanvasRenderer:
@ -1026,7 +1026,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8f0e6d6f313cacd40b84e6ea0922b0fa, type: 3}
m_Sprite: {fileID: 21300000, guid: 089ca9e468fdfd14ebd66370e335159c, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -1425,7 +1425,7 @@ RectTransform:
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: 4}
m_AnchoredPosition: {x: 0, y: 6}
m_SizeDelta: {x: 208, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1104163593313499312

View File

@ -586,7 +586,7 @@ RectTransform:
m_GameObject: {fileID: 6124127957932188862}
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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
m_Children: []
m_Father: {fileID: 6124127957792349541}
m_RootOrder: 3
@ -1755,6 +1755,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3}
--- !u!224 &6124127957488033513 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a,
type: 3}
m_PrefabInstance: {fileID: 2705466137574694683}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1703305198614521804 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a,
@ -1767,12 +1773,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &6124127957488033513 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a,
type: 3}
m_PrefabInstance: {fileID: 2705466137574694683}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6124127957283136057
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -448,6 +448,12 @@ PrefabInstance:
propertyPath: m_Layer
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8326132141571715836, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 96d284d2c6e6e4016be054a7a809f2bc,
type: 3}
- target: {fileID: 8326132141572152555, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
type: 3}
propertyPath: m_Layer
@ -533,6 +539,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8326132141884556178, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8326132141892762132, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
type: 3}
propertyPath: m_Layer

File diff suppressed because it is too large Load Diff