From 0e4891a2d990905efd09e602abf8acbc9e146945 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 25 Jul 2022 14:35:29 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=82=B9=E3=83=94=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/MiniGame/MiniGame.unity | 17 ++- .../Scenes/MiniGame/Scripts/GameManager.cs | 1 + .../MyGame/Scenes/MiniGame/Scripts/Player.cs | 111 ++++++++++-------- 3 files changed, 81 insertions(+), 48 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index cc9ea30c..a712f0c2 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -1023,6 +1023,21 @@ PrefabInstance: propertyPath: fallAcceleration value: 30 objectReference: {fileID: 0} + - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, + type: 3} + propertyPath: hardSpeedMultiply + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, + type: 3} + propertyPath: extraSpeedMultiply + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, + type: 3} + propertyPath: normalSpeedMultiply + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028, type: 3} propertyPath: hitAnimationCurve.m_PostInfinity @@ -1434,7 +1449,7 @@ MonoBehaviour: - {fileID: 2044773546} - {fileID: 184442867} - {fileID: 628830308} - bgWidth: 17.66 + bgWidth: 17.6 bgOffset: 0 holeWidth: 0 --- !u!114 &1657044091 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index 9c1f2fee..25a0dabf 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -211,6 +211,7 @@ namespace MyGame.Scenes.MiniGame.Scripts stageManager.Difficulty.SkipLatestValueOnSubscribe().Subscribe(x => { bgManager.SetSky(x); + player.SetSpeed(x); }).AddTo(this); player.OnHitItem.Where(_ => state.Value == GameState.Play).Subscribe(x => diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs index 7082bb63..5ab9b27b 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs @@ -8,6 +8,9 @@ namespace MyGame.Scenes.MiniGame.Scripts public class Player : MonoBehaviour { [SerializeField] private float speed = 5f; + [SerializeField] private float normalSpeedMultiply; + [SerializeField] private float hardSpeedMultiply; + [SerializeField] private float extraSpeedMultiply; [SerializeField] private float hitJumpTime = 1f; [SerializeField] private float hitTime = 1.5f; [SerializeField] private float hitWaitTime = 1f; @@ -35,6 +38,7 @@ namespace MyGame.Scenes.MiniGame.Scripts private bool isWall; private bool isResult; private float currentFallSpeed; + private float currentSpeedMultiply; public bool IsHit => isHit; private readonly CompositeDisposable jumpCompositeDisposable = new CompositeDisposable(); private readonly CompositeDisposable hitCompositeDisposable = new CompositeDisposable(); @@ -70,6 +74,7 @@ namespace MyGame.Scenes.MiniGame.Scripts isHole = false; isWall = false; isResult = false; + currentSpeedMultiply = 1f; } private void Stay(bool force = false) @@ -87,7 +92,7 @@ namespace MyGame.Scenes.MiniGame.Scripts { return; } - transform.AddPositionX(speed * Time.deltaTime); + transform.AddPositionX(speed * Time.deltaTime * currentSpeedMultiply); if (isJump || isHit || isFall) { return; @@ -108,7 +113,8 @@ namespace MyGame.Scenes.MiniGame.Scripts isFall = false; var lastFrame = jumpAnimationCurve[jumpAnimationCurve.length - 1]; // 最高点までのジャンプ - var jumpCoroutine = MonoBehaviourExtensions.DoCallLerp(lastFrame.time, t => + var jumpTime = lastFrame.time / currentSpeedMultiply; + var jumpCoroutine = MonoBehaviourExtensions.DoCallLerp(jumpTime, t => { transform.SetLocalPositionY(basePos.y + jumpAnimationCurve.Evaluate(t * lastFrame.time)); }, () => @@ -118,7 +124,7 @@ namespace MyGame.Scenes.MiniGame.Scripts isFall = true; }); // 通常落下 - var jumpFallCoroutine = MonoBehaviourExtensions.DoCallLerp(lastFrame.time, t => + var jumpFallCoroutine = MonoBehaviourExtensions.DoCallLerp(jumpTime, t => { transform.SetLocalPositionY(basePos.y + jumpAnimationCurve.Evaluate((t + 1) * lastFrame.time)); }, () => @@ -159,10 +165,10 @@ namespace MyGame.Scenes.MiniGame.Scripts else { animator.Play("Brother_pink_Glideing_Cancel"); - currentFallSpeed -= fallAcceleration * Time.deltaTime; + currentFallSpeed -= fallAcceleration * Time.deltaTime * currentSpeedMultiply; } - transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime); + transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime * currentSpeedMultiply); }, () => { currentFallSpeed = 0f; @@ -201,40 +207,34 @@ namespace MyGame.Scenes.MiniGame.Scripts // 落下時間不定によりアニメ再生停止 animator.speed = 0f; currentFallSpeed = 0f; - this.UpdateAsObservable() - .TakeWhile(_ => transform.localPosition.y > basePos.y) - .Subscribe(_ => + FallDown(basePos.y, () => + { + // 31フレームまでが落下32からズサー + animator?.PlayInFixedTime("Brother_pink_FallDown", 0, .5f); + animator.speed = currentSpeedMultiply; + transform.SetLocalPositionY(groundPos); + currentFallSpeed = 0f; + isJump = false; + isFall = false; + Observable.Timer(TimeSpan.FromSeconds(hitTime)).Subscribe(_ => { }, () => { - currentFallSpeed -= fallAcceleration * Time.deltaTime; - transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime); - }, () => - { - // 31フレームまでが落下32からズサー - animator?.PlayInFixedTime("Brother_pink_FallDown", 0, .5f); - animator.speed = 1f; - transform.SetLocalPositionY(groundPos); - currentFallSpeed = 0f; - isJump = false; - isFall = false; - Observable.Timer(TimeSpan.FromSeconds(hitTime)).Subscribe(_ => { }, () => + isHitStay = true; + Observable.Timer(TimeSpan.FromSeconds(hitWaitTime)).Subscribe(_ => { }, () => { - isHitStay = true; - Observable.Timer(TimeSpan.FromSeconds(hitWaitTime)).Subscribe(_ => { }, () => + // 入れ子対策するならコルーチンにして工程ごとに分けてSelectManyするのがよい。 + isHit = false; + isHitStay = false; + if (isResult) { - // 入れ子対策するならコルーチンにして工程ごとに分けてSelectManyするのがよい。 - isHit = false; - isHitStay = false; - if (isResult) - { - Result(); - } - else - { - Stay(); - } - }).AddTo(hitCompositeDisposable); + Result(); + } + else + { + Stay(); + } }).AddTo(hitCompositeDisposable); }).AddTo(hitCompositeDisposable); + }).AddTo(jumpCompositeDisposable); }).AddTo(hitCompositeDisposable); } @@ -249,21 +249,26 @@ namespace MyGame.Scenes.MiniGame.Scripts hitCompositeDisposable.Clear(); jumpCompositeDisposable.Clear(); - this.UpdateAsObservable() - .TakeWhile(_ => transform.localPosition.y > fallLimit) + FallDown(fallLimit, () => + { + isFall = false; + currentFallSpeed = 0f; + if (isResult) + { + Result(); + } + }).AddTo(jumpCompositeDisposable); + } + + private IDisposable FallDown(float baseYPos, Action onComplete) + { + return this.UpdateAsObservable() + .TakeWhile(_ => transform.localPosition.y > baseYPos) .Subscribe(_ => { - currentFallSpeed -= fallAcceleration * Time.deltaTime; - transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime); - }, () => - { - isFall = false; - currentFallSpeed = 0f; - if (isResult) - { - Result(); - } - }).AddTo(jumpCompositeDisposable); + currentFallSpeed -= fallAcceleration * Time.deltaTime * currentSpeedMultiply; + transform.AddLocalPositionY(currentFallSpeed * Time.deltaTime * currentSpeedMultiply); + }, onComplete); } public void Wall() @@ -271,6 +276,18 @@ namespace MyGame.Scenes.MiniGame.Scripts isWall = true; } + public void SetSpeed(ScrollGameDifficulty difficulty) + { + currentSpeedMultiply = difficulty switch + { + ScrollGameDifficulty.Easy => 1f, + ScrollGameDifficulty.Normal => normalSpeedMultiply, + ScrollGameDifficulty.Hard => hardSpeedMultiply, + ScrollGameDifficulty.Extra => extraSpeedMultiply, + _ => throw new ArgumentOutOfRangeException(nameof(difficulty), difficulty, null) + }; + } + public void Result() { if (isJump || isHit || isFall) From e9218e1a535653a1e97a3b768199072da9e1ffa9 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 25 Jul 2022 14:54:10 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=82=B3=E3=82=A2=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/MiniGame/Prefabs/Header.prefab | 380 ++++++++---------- .../Scenes/MiniGame/Scripts/HeaderView.cs | 37 +- 2 files changed, 178 insertions(+), 239 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab index 93b7b311..2b31b226 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab @@ -1,5 +1,178 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2570823429725665912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7957151030862449602} + - component: {fileID: 7090706454885209789} + - component: {fileID: 6898933620753137981} + m_Layer: 5 + m_Name: Text_countDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7957151030862449602 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2570823429725665912} + 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: 2.3549} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1812783774180679619} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7090706454885209789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2570823429725665912} + m_CullTransparentMesh: 0 +--- !u!114 &6898933620753137981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2570823429725665912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, type: 2} + m_sharedMaterial: {fileID: 5374284371091958195, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 200 + m_fontSizeBase: 200 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3654461001691508598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1812783774180679619} + m_Layer: 5 + m_Name: CountDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1812783774180679619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3654461001691508598} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7957151030862449602} + m_Father: {fileID: 7328251774731631637} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 714} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7328251774731631636 GameObject: m_ObjectHideFlags: 0 @@ -29,8 +202,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7328251775215910466} - {fileID: 7328251775992443661} + - {fileID: 1812783774180679619} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -51,10 +224,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 109145d75cad47b886be1e9be454f54b, type: 3} m_Name: m_EditorClassIdentifier: - text: {fileID: 7932948163013127618} - timeText: {fileID: 7932948163013127618} - countDownAnimator: {fileID: 0} - countDownText: {fileID: 0} + text: {fileID: 6898933620753137981} --- !u!1 &7328251775195385351 GameObject: m_ObjectHideFlags: 0 @@ -193,124 +363,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!1 &7328251775215910465 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7328251775215910466} - - component: {fileID: 7328251775215910476} - - component: {fileID: 7328251775215910467} - - component: {fileID: 5864280262123773036} - m_Layer: 5 - m_Name: time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7328251775215910466 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7328251775215910465} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7932948163013127619} - m_Father: {fileID: 7328251774731631637} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -137} - m_SizeDelta: {x: 186, y: 204} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7328251775215910476 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7328251775215910465} - m_CullTransparentMesh: 0 ---- !u!114 &7328251775215910467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7328251775215910465} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b840fc03d9c919544b8d4beefd48696d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5864280262123773036 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7328251775215910465} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} - m_Name: - m_EditorClassIdentifier: - mTerm: minigame_main_frame_time - mTermSecondary: - PrimaryTermModifier: 0 - SecondaryTermModifier: 0 - TermPrefix: - TermSuffix: - LocalizeOnAwake: 1 - IgnoreRTL: 0 - MaxCharactersInRTL: 0 - IgnoreNumbersInRTL: 1 - CorrectAlignmentForRTL: 1 - AddSpacesToJoinedLanguages: 0 - AllowLocalizedParameters: 1 - AllowParameters: 1 - TranslatedObjects: - - {fileID: 21300000, guid: b840fc03d9c919544b8d4beefd48696d, type: 3} - LocalizeEvent: - m_PersistentCalls: - m_Calls: [] - AlwaysForceLocalize: 0 - LocalizeCallBack: - Target: {fileID: 0} - MethodName: - mGUI_ShowReferences: 0 - mGUI_ShowTems: 1 - mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 0} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &7328251775992443660 GameObject: m_ObjectHideFlags: 0 @@ -342,7 +394,7 @@ RectTransform: - {fileID: 7328251776013493869} - {fileID: 7328251775195385344} m_Father: {fileID: 7328251774731631637} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -425,83 +477,3 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7932948163013127616 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7932948163013127619} - - component: {fileID: 7932948163013127621} - - component: {fileID: 7932948163013127618} - m_Layer: 5 - m_Name: Text_time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7932948163013127619 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7932948163013127616} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7328251775215910466} - 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: 86, y: -127} - m_SizeDelta: {x: 87, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7932948163013127621 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7932948163013127616} - m_CullTransparentMesh: 0 ---- !u!114 &7932948163013127618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7932948163013127616} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.3372549, g: 0.21960784, b: 0.14117648, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 75 - m_FontStyle: 1 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 75 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 60 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs index af64f93f..b3a43112 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs @@ -8,41 +8,8 @@ namespace MyGame.Scenes.MiniGame.Scripts { public class HeaderView : MonoBehaviour { - [SerializeField] private Text text; - [SerializeField] private Text timeText; - [SerializeField] private Animator countDownAnimator; - [SerializeField] private TextMeshProUGUI countDownText; - private int count = 5; - - private void Start() - { - countDownAnimator.gameObject.SetActive(false); - } - + [SerializeField] private TextMeshProUGUI text; + public void ChangeItemCount(int value) => text.text = value.ToString(); - - public void ChangeTimeCount(float newTime) - { - timeText.text = $"{newTime:0}"; - } - - public void StartCountDown() - { - Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f)) - .Select(x => count - x) - .Take(count) - .Subscribe(x => - { - countDownAnimator.gameObject.SetActive(true); - countDownText.text = x.ToString(); - countDownAnimator.Play("CountDown", 0, 0f); - }, () => - { - Observable.Timer(TimeSpan.FromSeconds(1f)).Subscribe(_ => - { - countDownAnimator.gameObject.SetActive(false); - }).AddTo(this); - }).AddTo(this); - } } } \ No newline at end of file From 4309afc4f8520e25680ea8481fdd9ad1227a5435 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 25 Jul 2022 14:56:04 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E8=83=8C=E6=99=AF=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/sky_switching_c_d.anim | 1719 ++++++++++++----- .../Scenes/MiniGame/Prefabs/BackGround.prefab | 228 +-- .../Scenes/MiniGame/Prefabs/sky_d.prefab | 430 +---- 3 files changed, 1314 insertions(+), 1063 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/sky_switching_c_d.anim b/popcorn/Assets/MyGame/Resource/Animation/sky_switching_c_d.anim index 4fa9cd98..587a9a87 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/sky_switching_c_d.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/sky_switching_c_d.anim @@ -48,15 +48,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -70,6 +61,510 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + 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: m_Color.a + path: sky_c/ef_star (5) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (4) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (3) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (2) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (1) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.7294118 + 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.r + path: sky_c/sky/sky + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5058824 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.9529412 + 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.g + path: sky_c/sky/sky + classID: 212 + 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.33333334 + value: 0.4745098 + 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.b + path: sky_c/sky/sky + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.7490196 + 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.r + path: sky_c/sky/sky_a + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5411765 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.9647059 + 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.g + path: sky_c/sky/sky_a + classID: 212 + 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.33333334 + value: 0.60784316 + 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.b + path: sky_c/sky/sky_a + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.78039217 + 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.r + path: sky_c/sky/sky_b + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.98039216 + 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.g + path: sky_c/sky/sky_b + classID: 212 + 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.33333334 + value: 0.7607843 + 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.b + path: sky_c/sky/sky_b + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8117647 + 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.r + path: sky_c/sky/sky_c + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.654902 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.9882353 + 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.g + path: sky_c/sky/sky_c + classID: 212 + 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.33333334 + value: 0.85490197 + 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.b + path: sky_c/sky/sky_c + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -97,6 +592,15 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.33333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -104,6 +608,25 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sky_d/sky + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 0.33333334 value: 1 @@ -120,230 +643,6 @@ AnimationClip: path: sky_d/pt_Glitter 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.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: sky_d/sky/sky - classID: 212 - 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: sky_d/sky/sky_a - classID: 212 - 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: sky_d/sky/sky_b - classID: 212 - 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: sky_d/sky/sky_c - classID: 212 - 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: sky_d/sky/sky_d - classID: 212 - 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: sky_d/sky/sky_e - classID: 212 - 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: sky_d/sky/sky_f - classID: 212 - 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: sky_d/sky/sky_a (1) - classID: 212 - script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -366,6 +665,132 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 424324492 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 5348557 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1326451210 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1443576651 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2099669128 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2361241841 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2466596834 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2466596834 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2466596834 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3267351794 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3267351794 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3267351794 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1538688328 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1538688328 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1538688328 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 749843934 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 749843934 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 749843934 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3098257925 attribute: 2086281974 @@ -373,6 +798,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1258994577 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2125476592 attribute: 2086281974 @@ -380,62 +812,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4150536747 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 3951346033 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1921880267 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 92971101 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 2616079870 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 3974694248 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1977636050 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 404661653 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -489,15 +865,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -511,6 +878,510 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + 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: m_Color.a + path: sky_c/ef_star (5) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (4) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (3) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (2) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star (1) + classID: 212 + 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.33333334 + 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: m_Color.a + path: sky_c/ef_star + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.7294118 + 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.r + path: sky_c/sky/sky + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5058824 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.9529412 + 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.g + path: sky_c/sky/sky + classID: 212 + 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.33333334 + value: 0.4745098 + 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.b + path: sky_c/sky/sky + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.7490196 + 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.r + path: sky_c/sky/sky_a + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5411765 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.9647059 + 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.g + path: sky_c/sky/sky_a + classID: 212 + 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.33333334 + value: 0.60784316 + 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.b + path: sky_c/sky/sky_a + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.78039217 + 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.r + path: sky_c/sky/sky_b + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.98039216 + 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.g + path: sky_c/sky/sky_b + classID: 212 + 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.33333334 + value: 0.7607843 + 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.b + path: sky_c/sky/sky_b + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8117647 + 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.r + path: sky_c/sky/sky_c + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.654902 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.9882353 + 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.g + path: sky_c/sky/sky_c + classID: 212 + 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.33333334 + value: 0.85490197 + 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.b + path: sky_c/sky/sky_c + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -538,6 +1409,15 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.33333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -545,6 +1425,25 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sky_d/sky + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 0.33333334 value: 1 @@ -561,230 +1460,6 @@ AnimationClip: path: sky_d/pt_Glitter 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.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: sky_d/sky/sky - classID: 212 - 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: sky_d/sky/sky_a - classID: 212 - 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: sky_d/sky/sky_b - classID: 212 - 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: sky_d/sky/sky_c - classID: 212 - 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: sky_d/sky/sky_d - classID: 212 - 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: sky_d/sky/sky_e - classID: 212 - 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: sky_d/sky/sky_f - classID: 212 - 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: sky_d/sky/sky_a (1) - classID: 212 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab index 74c53dea..1cd4ea74 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab @@ -420,7 +420,7 @@ Transform: m_GameObject: {fileID: 6693468020679260202} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -16.517555, y: 11.06614, z: 43.01684} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.001, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1723748830347897422} @@ -1449,6 +1449,21 @@ PrefabInstance: propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 4160557473229173824, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4160557473229173824, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.g + value: 0.5411765 + objectReference: {fileID: 0} + - target: {fileID: 4160557473229173824, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.r + value: 0.7490196 + objectReference: {fileID: 0} - target: {fileID: 4281825364835494824, guid: 9c217c7121db82e4c82db55757b960a0, type: 3} propertyPath: m_Color.a @@ -1459,6 +1474,21 @@ PrefabInstance: propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 4700031321679189731, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4700031321679189731, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.g + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 4700031321679189731, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.r + value: 0.78039217 + objectReference: {fileID: 0} - target: {fileID: 5477829989002693059, guid: 9c217c7121db82e4c82db55757b960a0, type: 3} propertyPath: m_RootOrder @@ -1524,6 +1554,21 @@ PrefabInstance: propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 6887323207604125850, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6887323207604125850, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.g + value: 0.654902 + objectReference: {fileID: 0} + - target: {fileID: 6887323207604125850, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.r + value: 0.8117647 + objectReference: {fileID: 0} - target: {fileID: 7005640920886376159, guid: 9c217c7121db82e4c82db55757b960a0, type: 3} propertyPath: m_Color.a @@ -1544,6 +1589,21 @@ PrefabInstance: propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 8696043235658308137, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8696043235658308137, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.g + value: 0.5058824 + objectReference: {fileID: 0} + - target: {fileID: 8696043235658308137, guid: 9c217c7121db82e4c82db55757b960a0, + type: 3} + propertyPath: m_Color.r + value: 0.7294118 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c217c7121db82e4c82db55757b960a0, type: 3} --- !u!4 &7805892084240676278 stripped @@ -2424,21 +2484,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 3365573933646798116, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3365573933646798116, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.b - value: 0.3803922 - objectReference: {fileID: 0} - - target: {fileID: 3365573933646798116, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.5831506 - objectReference: {fileID: 0} - target: {fileID: 3792660538810734569, guid: 724fe1e0b09928748a11602a2ecb1ea9, type: 3} propertyPath: m_Name @@ -2449,36 +2494,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 4160557473229173824, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4160557473229173824, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.5539452 - objectReference: {fileID: 0} - - target: {fileID: 4160557473229173824, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.r - value: 0.5411765 - objectReference: {fileID: 0} - - target: {fileID: 4700031321679189731, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4700031321679189731, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.8656916 - objectReference: {fileID: 0} - - target: {fileID: 4700031321679189731, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.r - value: 0.6 - objectReference: {fileID: 0} - target: {fileID: 5477829989002693059, guid: 724fe1e0b09928748a11602a2ecb1ea9, type: 3} propertyPath: m_RootOrder @@ -2534,101 +2549,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5641574076770585236, guid: 724fe1e0b09928748a11602a2ecb1ea9, + - target: {fileID: 6616841844161306725, guid: 724fe1e0b09928748a11602a2ecb1ea9, type: 3} - propertyPath: m_Color.a + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 5641574076770585236, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.b - value: 0.3820755 - objectReference: {fileID: 0} - - target: {fileID: 5641574076770585236, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.73379296 - objectReference: {fileID: 0} - - target: {fileID: 6887323207604125850, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6887323207604125850, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.b - value: 0.47209862 - objectReference: {fileID: 0} - - target: {fileID: 6887323207604125850, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.9716981 - objectReference: {fileID: 0} - - target: {fileID: 6887323207604125850, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.r - value: 0.6424166 - objectReference: {fileID: 0} - - target: {fileID: 7348119309522671551, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: InitialModule.startColor.maxColor.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7348119309522671551, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: InitialModule.startColor.maxColor.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7348119309522671551, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: InitialModule.startColor.maxColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7682136844757441359, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7682136844757441359, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.5058824 - objectReference: {fileID: 0} - - target: {fileID: 7682136844757441359, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.r - value: 0.882597 - objectReference: {fileID: 0} - - target: {fileID: 7875505234932119854, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7875505234932119854, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.b - value: 0.4669811 - objectReference: {fileID: 0} - - target: {fileID: 7875505234932119854, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.98625916 - objectReference: {fileID: 0} - - target: {fileID: 8696043235658308137, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8696043235658308137, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.g - value: 0.504717 - objectReference: {fileID: 0} - - target: {fileID: 8696043235658308137, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - propertyPath: m_Color.r - value: 0.72794306 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 724fe1e0b09928748a11602a2ecb1ea9, type: 3} --- !u!4 &347748900199299103 stripped @@ -2637,23 +2562,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5248482000621646300} m_PrefabAsset: {fileID: 0} ---- !u!1 &1370752401278587321 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6616841844161306725, guid: 724fe1e0b09928748a11602a2ecb1ea9, - type: 3} - m_PrefabInstance: {fileID: 5248482000621646300} - m_PrefabAsset: {fileID: 0} ---- !u!210 &9145684817434126291 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1370752401278587321} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -1 --- !u!1001 &5291498790726213867 PrefabInstance: m_ObjectHideFlags: 0 @@ -3437,6 +3345,16 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 7413912113725773461, guid: 682cb6897a7801848a19158996bbed8f, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7413912113725773461, guid: 682cb6897a7801848a19158996bbed8f, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7413912113725773461, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_LocalPosition.x diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab index 1e1dd3c4..b127e774 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_d.prefab @@ -1,89 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &119461900818448650 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6594487855321563149} - - component: {fileID: 3365573933646798116} - m_Layer: 0 - m_Name: sky_f - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6594487855321563149 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119461900818448650} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -6.4900002, z: 0} - m_LocalScale: {x: 16.66, y: 13.471875, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2051980890292022942} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3365573933646798116 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119461900818448650} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: -2 - m_Sprite: {fileID: 21300000, guid: bb188fd763f57c0429accb1301e0f529, type: 3} - m_Color: {r: 1, g: 0.5831506, b: 0.3803922, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.06, y: 1.02} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1206408690401904140 GameObject: m_ObjectHideFlags: 0 @@ -95,7 +11,7 @@ GameObject: - component: {fileID: 6914071739505165440} - component: {fileID: 7348119309522671551} - component: {fileID: 6635052574704375953} - m_Layer: 5 + m_Layer: 0 m_Name: pt_Glitter m_TagString: Untagged m_Icon: {fileID: 0} @@ -125,7 +41,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1206408690401904140} serializedVersion: 8 - lengthInSec: 0.1 + lengthInSec: 0.5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -305,37 +221,37 @@ ParticleSystem: m_RotationOrder: 4 startColor: serializedVersion: 2 - minMaxState: 0 + minMaxState: 4 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 0.9647059, a: 1} + maxColor: {r: 1, g: 1, b: 0.9575472, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0.5235849, g: 1, b: 1, a: 1} + key2: {r: 1, g: 1, b: 0.46666667, a: 1} + key3: {r: 1, g: 0.78074294, b: 0.64705884, a: 1} + key4: {r: 1, g: 0.7311321, b: 0.77415526, a: 1} + key5: {r: 1, g: 1, b: 1, a: 0} + key6: {r: 1, g: 1, b: 1, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 + ctime1: 12722 + ctime2: 26792 + ctime3: 40285 + ctime4: 54934 + ctime5: 65535 + ctime6: 65535 ctime7: 0 atime0: 0 atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 + atime2: 65535 + atime3: 65535 + atime4: 65535 atime5: 0 atime6: 0 atime7: 0 m_Mode: 0 - m_NumColorKeys: 2 + m_NumColorKeys: 6 m_NumAlphaKeys: 2 minGradient: serializedVersion: 2 @@ -685,7 +601,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 5 + maxNumParticles: 10 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -4886,7 +4802,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 100 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 @@ -4917,174 +4833,6 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!1 &3358577087740546913 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3397331717539262769} - - component: {fileID: 5641574076770585236} - m_Layer: 0 - m_Name: sky_e - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3397331717539262769 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3358577087740546913} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -4.37, z: 0} - m_LocalScale: {x: 16.66, y: 13.471875, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2051980890292022942} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5641574076770585236 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3358577087740546913} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: -3 - m_Sprite: {fileID: 21300000, guid: bb188fd763f57c0429accb1301e0f529, type: 3} - m_Color: {r: 1, g: 0.73379296, b: 0.3820755, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.06, y: 1.02} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &5988455566001223894 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 46913991714984352} - - component: {fileID: 7682136844757441359} - m_Layer: 0 - m_Name: sky_a (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &46913991714984352 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5988455566001223894} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 17.21, z: 0} - m_LocalScale: {x: 16.66, y: 5.39, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2051980890292022942} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7682136844757441359 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5988455566001223894} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: -7 - m_Sprite: {fileID: 21300000, guid: bb188fd763f57c0429accb1301e0f529, type: 3} - m_Color: {r: 0.882597, g: 0.5058824, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.06, y: 1.02} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &6427234993242507175 GameObject: m_ObjectHideFlags: 0 @@ -5102,7 +4850,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6768129783814160542 Transform: m_ObjectHideFlags: 0 @@ -5111,7 +4859,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6427234993242507175} m_LocalRotation: {x: -0.7071068, y: -0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 8.6, y: -3.33, z: 0.02626168} + m_LocalPosition: {x: 2.28, y: -3.33, z: 0.02626168} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -9911,90 +9659,6 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!1 &6768238790621475214 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3710382013320883080} - - component: {fileID: 7875505234932119854} - m_Layer: 0 - m_Name: sky_d - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3710382013320883080 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6768238790621475214} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -2.0599992, z: 0} - m_LocalScale: {x: 16.66, y: 13.471875, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2051980890292022942} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7875505234932119854 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6768238790621475214} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: -4 - m_Sprite: {fileID: 21300000, guid: bb188fd763f57c0429accb1301e0f529, type: 3} - m_Color: {r: 1, g: 0.98625916, b: 0.4669811, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.06, y: 1.02} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &6822075481438686701 GameObject: m_ObjectHideFlags: 0 @@ -10333,7 +9997,7 @@ ParticleSystem: startSizeY: serializedVersion: 2 minMaxState: 0 - scalar: 0.04 + scalar: 0.1 minScalar: 1 maxCurve: serializedVersion: 2 @@ -14797,7 +14461,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 69 + m_SortingOrder: 100 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 @@ -15166,7 +14830,7 @@ ParticleSystem: startSizeY: serializedVersion: 2 minMaxState: 0 - scalar: 0.04 + scalar: 0.1 minScalar: 1 maxCurve: serializedVersion: 2 @@ -15695,7 +15359,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 6 + scalar: 3 minScalar: 10 maxCurve: serializedVersion: 2 @@ -19630,7 +19294,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 69 + m_SortingOrder: 100 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 @@ -19691,17 +19355,17 @@ PrefabInstance: - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.60784316 objectReference: {fileID: 0} - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.5539452 + value: 0.9647059 objectReference: {fileID: 0} - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.r - value: 0.5411765 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -19766,7 +19430,7 @@ PrefabInstance: - target: {fileID: 4310680609274672819, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_LocalPosition.y - value: 0.33999997 + value: -4.73 objectReference: {fileID: 0} - target: {fileID: 4873563891586189522, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -19776,17 +19440,17 @@ PrefabInstance: - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.4745098 objectReference: {fileID: 0} - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.504717 + value: 0.9529412 objectReference: {fileID: 0} - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.r - value: 0.72794306 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -19826,7 +19490,7 @@ PrefabInstance: - target: {fileID: 6456866599985111109, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_LocalPosition.y - value: 7.04 + value: 0.93 objectReference: {fileID: 0} - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -19911,17 +19575,17 @@ PrefabInstance: - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.7607843 objectReference: {fileID: 0} - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.8656916 + value: 0.98039216 objectReference: {fileID: 0} - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.r - value: 0.6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -19931,22 +19595,22 @@ PrefabInstance: - target: {fileID: 8248191766041004250, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_LocalPosition.y - value: 9.38 + value: 1.88 objectReference: {fileID: 0} - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.47209862 + value: 0.85490197 objectReference: {fileID: 0} - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.9716981 + value: 0.9882353 objectReference: {fileID: 0} - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.r - value: 0.6424166 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -19955,12 +19619,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 682cb6897a7801848a19158996bbed8f, type: 3} ---- !u!4 &2051980890292022942 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3935214977879978440, guid: 682cb6897a7801848a19158996bbed8f, - type: 3} - m_PrefabInstance: {fileID: 3091343544706391894} - m_PrefabAsset: {fileID: 0} --- !u!4 &5477829989002693059 stripped Transform: m_CorrespondingSourceObject: {fileID: 7413912113725773461, guid: 682cb6897a7801848a19158996bbed8f,