From 216b5ac0122023a36de2ba36187822f3438d45e0 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 24 Nov 2021 18:56:22 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=E3=83=9D=E3=83=83=E3=83=97=E3=81=AE?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=80=81=E3=81=8A=E9=87=91=E3=81=AE?= =?UTF-8?q?=E6=96=87=E5=AD=97=E3=82=B5=E3=82=A4=E3=82=BA=E7=AD=89=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Mission/AchievementCanvas.prefab | 26 +++++++++---------- .../Scenes/Main/WatchMovieCoinGet.unity | 21 +++++++-------- .../Scenes/Main/WatchMovieFailure.unity | 8 +++--- .../Assets/MyGame/Scenes/Main/update.unity | 6 ++--- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 9eb59f4d..21b85a37 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -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 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index b9ea1a79..f596037a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -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: diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity index 34b83481..27f032ee 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity @@ -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: diff --git a/popcorn/Assets/MyGame/Scenes/Main/update.unity b/popcorn/Assets/MyGame/Scenes/Main/update.unity index 5bab4bb4..45a6b160 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/update.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/update.unity @@ -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 From 238e487fe99520e7f3ee1461b52d7947884eb94b Mon Sep 17 00:00:00 2001 From: hirokei Date: Wed, 24 Nov 2021 18:57:33 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=84=E3=81=AE=E8=A1=97=E3=81=A7?= =?UTF-8?q?=E3=81=AE=E6=BC=94=E5=87=BA=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/Brother/Brother.controller | 10 +- .../Animation/Brother/Brother_blue.anim | 220 +- ...ng_c.anim => Brother_blue_cleaning_b.anim} | 324 +- ...meta => Brother_blue_cleaning_b.anim.meta} | 0 ..._b.anim => Brother_blue_MoveSideways.anim} | 2 +- ...ta => Brother_blue_MoveSideways.anim.meta} | 0 .../Brother/Brother_blue_cleaning_a.anim | 189 +- .../Brother/Main_conversation_ef_Sweat.mat | 77 + .../Main_conversation_ef_Sweat.mat.meta | 8 + .../marketing_salesclerk_Blue_body 1.png | Bin 13744 -> 0 bytes .../marketing_salesclerk_Blue_body_noleg.png | Bin 0 -> 14435 bytes ...eting_salesclerk_Blue_body_noleg.png.meta} | 0 .../MyGame/Scenes/marketing/marketing.unity | 9652 ++++++++++++++++- 13 files changed, 10068 insertions(+), 414 deletions(-) rename popcorn/Assets/MyGame/Resource/Animation/{Brother_blue_cleaning_c.anim => Brother_blue_cleaning_b.anim} (85%) rename popcorn/Assets/MyGame/Resource/Animation/{Brother_blue_cleaning_c.anim.meta => Brother_blue_cleaning_b.anim.meta} (100%) rename popcorn/Assets/MyGame/Resource/Material/Brother/{Brother_blue_cleaning_b.anim => Brother_blue_MoveSideways.anim} (99%) rename popcorn/Assets/MyGame/Resource/Material/Brother/{Brother_blue_cleaning_b.anim.meta => Brother_blue_MoveSideways.anim.meta} (100%) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat.meta delete mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_body 1.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_body_noleg.png rename popcorn/Assets/MyGame/Resource/Material/Brother/{marketing_salesclerk_Blue_body 1.png.meta => marketing_salesclerk_Blue_body_noleg.png.meta} (100%) diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller index 057a123f..cbbe5cb8 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller @@ -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: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue.anim index bf44dd96..3944fb2a 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue.anim @@ -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} diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim similarity index 85% rename from popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim rename to popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim index 2d50e176..63601cd2 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim @@ -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 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim.meta b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim.meta rename to popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_b.anim b/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_MoveSideways.anim similarity index 99% rename from popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_b.anim rename to popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_MoveSideways.anim index 3dbb8153..4f9e499d 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_b.anim +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_MoveSideways.anim @@ -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 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_b.anim.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_MoveSideways.anim.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_b.anim.meta rename to popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_MoveSideways.anim.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_a.anim b/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_a.anim index 62caa994..4c711861 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_a.anim +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Brother_blue_cleaning_a.anim @@ -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 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat new file mode 100644 index 00000000..92d5b513 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat @@ -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} diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat.meta new file mode 100644 index 00000000..ef402e65 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_Sweat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e008c7a2e829742f2bcae5ed45022ff4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_body 1.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_body 1.png deleted file mode 100644 index a9f6622f0422c785058d8976803f9921afd50f37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13744 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 A3;+NC diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_body_noleg.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_body_noleg.png new file mode 100644 index 0000000000000000000000000000000000000000..908e35d02a6bb63e4f11fcc06811db7fd534b19a GIT binary patch literal 14435 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

)Py62X&Uz!Rr+u< zo%bHduTGFR`u}xJdzTOs{8soY{vymh7cG3kyO^3T%xj$u{W~-kN#`qK^kr7Yg*q`w zoMM9|sQVv6pS)3tV4n0wW;2NKf>L3EvN;Gzg*{b6Y~t7W6Z)2!?!X09S4T;zAtY5Y zacmP}ROx)-k3v`G3rDsH98;E_vKj{Rq77x!w$77$Do5`dL%Amhrp-z_-t9eNy36G>&Sl9OCw0+i2bm^2W}R?@Q(L#-r}nuN}X= z;_rQ0>m^H%2RGKOB|`NT??b5&du0S1J9n~PRV$I$5KMC3$y*ZM^`pH#R8(zyw%Z** zAc3OdowT=+qa>_Iso|ryDEe7k*=+@I=fup-Ji%OOQ!C@-BwK%3L3a++!cvi-KO>%W z5&2?JqXH(!zR$4qA6B^Prwh_oxMm&G&k|VKEERzIsqny1%1QHuVQlt;NNn8z8w%umc*ZRA! zdWw{Mh`zwF2%8V0g*;!Xua|F&KKr~3b1_;>5YkL~{8auAu-TNL&H~h=s3s=$Xa&V& z^=$6mC4q|U7%-dte_g9$T4bPZ2(`4m^|Klc!r-WA>D|$FU``<%f zz^kkKaSWgdw4)r=76`vGONG6^O3#w5KBQ68%LUDc-|@(_32fd^4`bf$VBJg_{tJ0c5TT)~H-)&B8pWvgiwj56NBw;BW_j>{JCw z-ZPR=3Y25uv(Z7fIoKx_!S0^ug}b zjIagbv{*;9&b~JMCx|{g(f}!D3@@j+U>s2*V{+x?64nMBes~04JRW!VU3B8^xO)YN<%_}yX#T6{8aLp9r$FXWBlexVaAguq|1L8r+f zsF53^Vbej4|1F-@0u7s6dBzYmd})C`;|_Vn%8Ob{^Qttt%?l<3wm?gJTzF!V5A3>< ziJWuiKZ}yzXJtU%G_DHi?CEeKtqR9MK6HBs8ug^w$jJNh>W>5xWixiW+4uYS^7t@YJ3_w~c)RDju5w|YLTr>*pm>G?GkeQT5&)>L)eJJO(0^3wCRk8s2 zy2u$_J(pOxv<{#8`}@qN&wxHE?C+-*xm4As-31D2>>@W-Q%?IYkDg?{RrYN?eTr&? zlk&-JyXkvrw*E_May+8;tdgfVGz#DJVudoq8?a9KA&P^Y@qFU|oV*FkBv4m7`&ec0 z0iMbJ=Tz#WwMF2dSGLw__G7ohq1VYKYj4@#pL(N5Sm1;3toy?I-w%dRJ3H$M0Q#7k z@I+{a{kouek=y|DVsNR_5+wf0O?A&i{1yF8-|bDw4;OZ7AG@)W7DL3JTIu}HsZ{TY z;wb)(QjyyyU(#hRS1TQ6Uz{kI|1~q+xbH-ZWIb%s-N&;-wW7X}qj$!=*M5%$+3efT zZn9g@eyRS-I-C~DA00jyX~aF?OBVvaV{6#ehk|3veQ8qI;C{rFa748{NAH2pREK!$ zua1g-eaPUsP*x`3-Z0-trjmO18KyrZl<0Ni^7E3zD*%14+EHMGST$ic`9mLf0g1=fUOw8XkmTud}Kf#@b zHGOg(7?19}+y)fT3cG1~c4g!l`m^4RrgLJ@wzl2he@T8~ z`-`r8#IYf!=FYHf_GyP1Q^FpM_mz+O$EY_-2-ge?jBd6ZrevNf2Plt4TP3&{z*-=LeLgq1=Y;^wVW4vU?GIl@>=1&mGz~|L$oB| z*`o}zejmf@_Gb49CyK*g(8>Pk+BPeRgD`i{lw=TBzUzsEZ+ ztDFbJ4(89^=wZ5{1+QviJN-L!Am7weLw@)E`upayv7Bm)DTn0XQey(zue}+4@FcUg z=~LO38lEDse7q#lL4sM$(W6lkCR*({T~6`H>06f!}~D%{qe&#fCEW-jse5q@1lEB7gfzbx316xZyI ztj5!iYT-wG_P?-HQPm=g$@0+b+oa3u@Xa{OsTTYrJ0(7_?IT^p?%%fd>GP3{s-^n$kM9#<3abW+1f{^$ zf=>UdnoV_*`2s1!RE>M$k)d$Nr>9b<()YQc{2KW7!Z?YWiGEs`9hINFGwYPOF5in? zO;v;-Rf*F_^{DuH(TfjvSvUyia#F=8e7HwJX50fh3dhLE86adD-7Zv;uJ_x=voCI2 z>!A7b9_9M_+|wh>7G^IRH}5bktGxGi89pid{G3;)5_3F7Tuwr_*+$5wSW)yH7zE^T z>Ek~lCoyx`eaC2hviAf$D}+S5Nuh?&$hd~+_0FMs;Ycsc z&pbllw8vgxT*zHPURDVS-r@y1g?BEF5WG|IQu}0M@hvI=&Z3W=scI$caJNbzVSf>Q zwv9A^=exi1B7&I8c0>)nM!#J8V&eFr=H_m@(|=g6J1`k~5Qn zXL_~~r)imkJ0(fZ3-`UNEJb4{0=oIyknV7B! z*gugj5sycnLe0KN zG7#0pFaGfkh^|ubXPBnt#KV8~^lJ2G3bt7z71|%FCtBQ3Q)KA**dBT@yeF#eXk6H`j=K^<+rRHg8_6$FyZLSRfS<2M646 zY+A>%@3C`wP`<9s;-3C?ZD<5Kge$m4bGPM&|KRf8pOiDv?!5jOzA9)zCj=E$rMFgc zbQRzKSX?9PX#l&N@Dflvk%VKm4N`s+DZzuj<(kZF+Cd zov$IGuOf-s315n2IZ_Qo)I0SG(F4l8xY`EdUzDem5S81nD|vq}rgw7X&an=r@3_ma z`FZ%NcRL$>mXAkCNM0UAbuLK_-G3mq=3)5#Z-zu_An5sG*?e5caK7VhT$ToXV&*4P z8F}5+*48a?&ASV?Kwi|=@J1vRqe`eEYI~b(=ZIjgNd>9 z+W4G1R%RSn=Xl_Kfrg_GmB=RfYL0S;p1Q0H^n!FdAzN9ws5py-RSh71H-b07x1p6E zawT0NziK<6kQ*XP6PfQ*nTw*imigNvAH3Z$F=X9z6HSj_N0VGRWNQ772WZ^Es? zQaM_DVFwtVR!r3R#Uv>C@z3vu)S<)e=!YF?^M;vi(r-3HnQ1;U+*w@P;4(_pC;?(< zFzQ#av4O@0#YyfKyFt#YvHf{6><}}ngvfytj)@e5T|QpTSNp*sP#FOxOq)#3gBXX< z9axt=p~cYes`6(JW^X1gAtUYk3(bnR_rba)T6$qt%ONnsud{QOdJLk^SH+GdnvFYx z6K`7(zm>^KP`NU0DO&(4zx{V|H!1@4%^V)4feHNOyGRryi}QH&j@$rD?a zzC%lYu!1)sxLcABEM;i)MK$!u^>UOe%vYzddiUnm7~cE}+B9IoCjEsyQ<4apcC;yc z=+!bjtY%zlH8gw!)5hHDnE=6lshRI)E`hLIzf{_xp~J8=7nhpUOu1?8M!mo1luy@W z%I{0(RR`$$@YS#?h6A3S>bBN(d!4P?6dF=7S>!&riT?W25G07zx8QNB%Af0jjxMi2 z`nZrL1_oV_?aVeCM{xxY9V|caft#E$6~9|v#O*9zI{Ph09Ymmo1}27y619WxfId(YeUIIGp=HYlbFKGehK%mXKP8 z0xk7z8UmjqJYx{3`}(}ZI0|d9{;#_Afm`S@Py=tXJm$7!{4gqhB=`j3uBLF0*=3T6d|NnISA&=QpJ&EiJuSw1Cx1~s~9+?t>Ir+$=HCT(n)gCOVqEw13o z>gv+?r!OBuvJ;@!Eur@sCzyttyu?j5KIv$OUssHe8q7A?B!Q6WBGZYkVr>WQPB-(} z(1nXjYyN+4jh~)#2cdD7pYu^?SaAYol6PJcolEi`0w|ww2^-hB$RlE$FV+Ts;5cmf z72jl@*otn(F@x76uHEy>XKK7Fm+wwYw5?NQ)E0DR&rVA_*q;Vyj@^*)?rK79{MNs7 z`hP`^Djl@{Y04^hgDD1{cPRHn{bNd3PA8B8diUSKu>Ul%j1$?wk)qZ&I{uWrSiucd zmye$6RI~q-lU##zuzlq6< zV-Nc`mIt^MJk=5w%4biW3@nuyM+UQksaGDi`VUbmu_T!1X#%09imjbBMO=vv;j5-( zM7UiyvYBJuJ7Kq>?HYIexuh;e6BQmX^mNfeD&V}vndKP&*oU4-2q|U+* zJi4dJL{E0iSb2V};ZR{5%-Tm_)3-Z8=I2*1h_S#9!>U~q;DDm`leeA-@t3FyPM6J7 zZa@B)Tr*O9llFx1#8E*`PvXRbbd*D;O{r!zf5yefMCe~mqlvHj*nD@-P89Ggh&m<2)w*#SESJ-?wG(Xw z(k3LHMU}W``@C5mtAd@#yOZs7WYL_h$eY!JEGgd5w9cG7|7fL}R8sRqD5>=m%pIll z6t2ZpobRdm8HCo=Po)uF?Z}MPAc!*ZcWUCVM>UebTZR zd0{e~ib>ncRDC8SiFQ{%m%D7@VRIJ^x`aYB2}!2mRz#!z5!i!r^ryZmIZ|yK=3JC< zPZ07Xmkpex(>3%pTMubZGvJyUCG_wiSNpjUn<3JIdEu5@S1!CG#;*>)g#5NWbsbR@ z%&}0tG)MmeSQ*GlS{Y0T&CDbGLve*Yax^q+`8(UFLv_{RkK?2RRszHm$cxZm5v~E< zL$21q!;y~=7UT|ZGYK0_jFpozRu>OnR}Hmy4#EGs$=-!y6JQCx$6T{#SjPPOHHZb) L& Date: Wed, 24 Nov 2021 19:19:46 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketing/Prefabs/MainCanvas.prefab | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index bf7d24a2..271cc6d2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -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 From fe8b3d594150842336ec887c9512baca0fcd8d4e Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 24 Nov 2021 20:13:54 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=9D=E3=83=83=E3=83=97=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=B3=E8=A9=B3=E7=B4=B0POP=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E3=80=81=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketing/Prefabs/Description.prefab | 18 +++++++++--------- .../Scenes/marketing/Prefabs/TankList.prefab | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 1751b3ed..b5a36fb0 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -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} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 8aa04970..5e2e3ce1 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -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 From a091e9aa12b401301ab0cbaa7dc89ef786c04bfd Mon Sep 17 00:00:00 2001 From: hirokei Date: Thu, 25 Nov 2021 10:12:57 +0900 Subject: [PATCH 5/5] =?UTF-8?q?conversation=E3=81=AE=E5=85=84=E3=81=AE?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Brother/Main_conversation_Blue_body_B.png | Bin 0 -> 15909 bytes .../Main_conversation_Blue_body_B.png.meta | 92 ++++++++++++++++++ .../Scenes/marketing/conversation.unity | 11 +++ 3 files changed, 103 insertions(+) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_B.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_B.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_B.png b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_B.png new file mode 100644 index 0000000000000000000000000000000000000000..9f6a3179df85fd69adddec322379f7fbf02c60dc GIT binary patch literal 15909 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 Hu0mjfN+GKp literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_B.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_B.png.meta new file mode 100644 index 00000000..132a01b5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_B.png.meta @@ -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: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity index 44b45e02..aa1efe10 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity @@ -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