修改细节

This commit is contained in:
yangjing 2022-02-15 12:16:18 +08:00
parent e8be486d07
commit 0750fd1325
7 changed files with 188 additions and 16 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b9e5ccea9730f4212a676cc98b3c1c24 guid: 8787407a3e52745438d76b5be4bdc0fd
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8787407a3e52745438d76b5be4bdc0fd guid: b9e5ccea9730f4212a676cc98b3c1c24
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

View File

@ -1,5 +1,79 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &1074116976095071813
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4734323287478086054}
- component: {fileID: 533362903110576947}
- component: {fileID: 6099835323015152707}
m_Layer: 5
m_Name: Img_ComingSoon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4734323287478086054
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1074116976095071813}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1890007151171864231}
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: -3.0000305, y: -51.5}
m_SizeDelta: {x: 335, y: 157}
m_Pivot: {x: 0.7, y: 1}
--- !u!222 &533362903110576947
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1074116976095071813}
m_CullTransparentMesh: 0
--- !u!114 &6099835323015152707
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1074116976095071813}
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: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 70d82c1f91d4849209e84353b848a604, 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!1 &1549853547358536703 --- !u!1 &1549853547358536703
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -905,7 +979,8 @@ MonoBehaviour:
mGobComplete: {fileID: 7274106816053439044} mGobComplete: {fileID: 7274106816053439044}
mImgProgress: {fileID: 7274106814941670833} mImgProgress: {fileID: 7274106814941670833}
mGobEmpty: {fileID: 1890007151263563442} mGobEmpty: {fileID: 1890007151263563442}
mGobComingSoon: {fileID: 1890007151171864230} mBtnComingSoon: {fileID: 7010971288309089060}
mImgComingSoon: {fileID: 6099835323015152707}
--- !u!1 &1549853548948624559 --- !u!1 &1549853548948624559
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1215,8 +1290,11 @@ GameObject:
- component: {fileID: 1890007151171864231} - component: {fileID: 1890007151171864231}
- component: {fileID: 1890007151171864249} - component: {fileID: 1890007151171864249}
- component: {fileID: 1890007151171864248} - component: {fileID: 1890007151171864248}
- component: {fileID: 7010971288309089060}
- component: {fileID: 5402614547375753744}
- component: {fileID: 3403624935305712569}
m_Layer: 5 m_Layer: 5
m_Name: Gob_ComingSoon m_Name: Btn_ComingSoon
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -1232,7 +1310,8 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 4734323287478086054}
m_Father: {fileID: 1549853548759154686} m_Father: {fileID: 1549853548759154686}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1278,6 +1357,80 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!114 &7010971288309089060
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890007151171864230}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1890007151171864248}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!95 &5402614547375753744
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890007151171864230}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 7c5794036b4624dd7a0d12e3ceb6bb4a, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &3403624935305712569
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890007151171864230}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 791356b2c7d5c444980c1472ffa8f1ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1890007151263563442 --- !u!1 &1890007151263563442
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using DG.Tweening;
public class LevelCell : MonoBehaviour public class LevelCell : MonoBehaviour
{ {
@ -17,14 +18,16 @@ public class LevelCell : MonoBehaviour
[SerializeField] Image mImgProgress; [SerializeField] Image mImgProgress;
[SerializeField] GameObject mGobEmpty; [SerializeField] GameObject mGobEmpty;
[SerializeField] GameObject mGobComingSoon; [SerializeField] Button mBtnComingSoon;
[SerializeField] Image mImgComingSoon;
private int mIndex; private int mIndex;
private int mLevelID; private int mLevelID;
private void Awake() private void Awake()
{ {
UIUtils.BindBtn(mBtnBg, OnClick); UIUtils.BindBtn(mBtnBg, OnClickBg);
UIUtils.BindBtn(mBtnComingSoon, OnClickComingSoon, AudioType.New);
} }
public void Init(int pIndex) public void Init(int pIndex)
@ -50,26 +53,40 @@ public class LevelCell : MonoBehaviour
mImgProgress.fillAmount = (float)tUnlockedEndingCount / tLvData.Endings.Count; mImgProgress.fillAmount = (float)tUnlockedEndingCount / tLvData.Endings.Count;
mBtnBg.gameObject.SetActive(true); mBtnBg.gameObject.SetActive(true);
mGobEmpty.gameObject.SetActive(false); mGobEmpty.SetActive(false);
mGobComingSoon.gameObject.SetActive(false); mBtnComingSoon.gameObject.SetActive(false);
} }
public void SetEmpty() public void SetEmpty()
{ {
mBtnBg.gameObject.SetActive(false); mBtnBg.gameObject.SetActive(false);
mGobEmpty.gameObject.SetActive(true); mGobEmpty.SetActive(true);
mGobComingSoon.gameObject.SetActive(false); mBtnComingSoon.gameObject.SetActive(false);
} }
public void SetComingSoon() public void SetComingSoon()
{ {
mBtnBg.gameObject.SetActive(false); mBtnBg.gameObject.SetActive(false);
mGobEmpty.gameObject.SetActive(false); mGobEmpty.SetActive(false);
mGobComingSoon.gameObject.SetActive(true); mBtnComingSoon.gameObject.SetActive(true);
} }
private void OnClick() private void OnClickBg()
{ {
DelClick?.Invoke(mIndex); DelClick?.Invoke(mIndex);
} }
private void OnClickComingSoon()
{
mImgComingSoon.gameObject.SetActive(true);
mImgComingSoon.color = Color.white;
mImgComingSoon.rectTransform.localScale = Vector3.zero;
mImgComingSoon.rectTransform.DOKill();
mImgComingSoon.rectTransform.DOScale(1, 0.3f).SetEase(Ease.OutBounce);
mImgComingSoon.DOKill();
mImgComingSoon.DOFade(0, 0.3f).SetDelay(0.8f);
}
} }

View File

@ -46,7 +46,8 @@ public class LevelOpening : MonoBehaviour
mCvsContent.alpha = 1; mCvsContent.alpha = 1;
mRctTitleBg.localScale = new Vector3(1, 0, 1); mRctTitleBg.localScale = new Vector3(1, 0, 1);
mImgLogo.rectTransform.anchoredPosition = new Vector2(600, 0); mImgLogo.rectTransform.anchoredPosition = new Vector2(600, 0);
mImgIcon.rectTransform.localScale = Vector3.zero; mImgIcon.rectTransform.localScale = Vector3.one * 1.2f;
mImgIcon.color = new Color(1, 1, 1, 0);
Sequence tAniSequence = DOTween.Sequence(); Sequence tAniSequence = DOTween.Sequence();
tAniSequence.Append(mRctTopFrame.DOAnchorPosY(360, 0.5f)); tAniSequence.Append(mRctTopFrame.DOAnchorPosY(360, 0.5f));
@ -55,7 +56,8 @@ public class LevelOpening : MonoBehaviour
tAniSequence.Append(mImgLogo.rectTransform.DOSizeDelta(new Vector2(550, mImgLogo.rectTransform.sizeDelta.y), 0.15f).SetEase(Ease.OutSine)); tAniSequence.Append(mImgLogo.rectTransform.DOSizeDelta(new Vector2(550, mImgLogo.rectTransform.sizeDelta.y), 0.15f).SetEase(Ease.OutSine));
tAniSequence.Append(mImgLogo.rectTransform.DOSizeDelta(new Vector2(640, mImgLogo.rectTransform.sizeDelta.y), 0.15f).SetEase(Ease.InSine)); tAniSequence.Append(mImgLogo.rectTransform.DOSizeDelta(new Vector2(640, mImgLogo.rectTransform.sizeDelta.y), 0.15f).SetEase(Ease.InSine));
tAniSequence.Append(mRctTitleBg.DOScale(Vector3.one, 0.3f).SetEase(Ease.OutBack)); tAniSequence.Append(mRctTitleBg.DOScale(Vector3.one, 0.3f).SetEase(Ease.OutBack));
tAniSequence.Join(mImgIcon.rectTransform.DOScale(Vector3.one, 0.3f).SetEase(Ease.OutBack).SetDelay(0.2f)); tAniSequence.Append(mImgIcon.rectTransform.DOScale(Vector3.one, 0.3f).SetEase(Ease.OutBounce));
tAniSequence.Join(mImgIcon.DOFade(1, 0.1f));
tAniSequence.AppendInterval(0.8f); tAniSequence.AppendInterval(0.8f);
tAniSequence.AppendCallback(Exit); tAniSequence.AppendCallback(Exit);
tAniSequence.Append(mCvsBg.DOFade(0, 0.3f)); tAniSequence.Append(mCvsBg.DOFade(0, 0.3f));