Skip to content

3
3D Fruit
Commit 050a9f35 authored by wanqing's avatar wanqing
Browse files
Options

修改ui

parent 7eaf4c59
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 233589 additions and 233198 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ 050a9f35
This diff is collapsed.
3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 050a9f35
......@@ -946,6 +946,7 @@ public class BattleUI : MonoBehaviour
//}
//m_playerRawImageObj.SetActive(false);
//m_playerRawImageObj.SetActive(true);
BattleCtrl.instance.levelManager.selectLevel.HideAllRole();
}
}
else
......
3D Fruit/Assets/#A2_Scripts/Level/SelectLevelCtrl.cs
View file @ 050a9f35
......@@ -63,6 +63,8 @@ public class SelectLevelCtrl : MonoBehaviour
private Vector3 m_FinalCameraPos = new Vector3(0, 1.64f, -1.56f);
private Quaternion m_StartCameraRotation = Quaternion.Euler(0, 0, 0);
private Vector3 m_moveTargetPos = new Vector3(0, 0.06f, 0.172f);
// Start is called before the first frame update
void Start()
{
......@@ -177,7 +179,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayGirlAnim(GlobalConfig.Ani_Walk);
m_sq = DOTween.Sequence();
m_sq.Append(m_girlTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_boyTrans.DOLocalMove(new Vector3(0,0,0.172f), 2.0f));
m_sq.Join(m_boyTrans.DOLocalMove(m_moveTargetPos, 2.0f));
m_sq.AppendCallback(MoveFinish);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
......@@ -187,7 +189,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayThreeAnim(GlobalConfig.Ani_Walk);
m_sq = DOTween.Sequence();
m_sq.Append(m_boyTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_threeTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
m_sq.Join(m_threeTrans.DOLocalMove(m_moveTargetPos, 2.0f));
m_sq.AppendCallback(MoveFinish);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
......@@ -197,7 +199,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayFourAnim(GlobalConfig.Ani_Walk);
m_sq = DOTween.Sequence();
m_sq.Append(m_threeTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_fourTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
m_sq.Join(m_fourTrans.DOLocalMove(m_moveTargetPos, 2.0f));
m_sq.AppendCallback(MoveFinish);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
......@@ -207,7 +209,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayFiveAnim(GlobalConfig.Ani_Walk);
m_sq = DOTween.Sequence();
m_sq.Append(m_fourTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_fiveTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
m_sq.Join(m_fiveTrans.DOLocalMove(m_moveTargetPos, 2.0f));
m_sq.AppendCallback(MoveFinish);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
......@@ -217,7 +219,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayGirlAnim(GlobalConfig.Ani_Walk);
m_sq = DOTween.Sequence();
m_sq.Append(m_fiveTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_girlTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
m_sq.Join(m_girlTrans.DOLocalMove(m_moveTargetPos, 2.0f));
m_sq.AppendCallback(MoveFinish);
}
}
......@@ -304,6 +306,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayFiveAnim(GlobalConfig.Ani_Idle1);
PlayGirlAnim(GlobalConfig.Ani_Idle1);
}
DelayPlayCameraAni();
}
//镜头向下移动
public void CameraMoveDown()
......@@ -311,11 +314,18 @@ public class SelectLevelCtrl : MonoBehaviour
Vector3 varPos = m_camera.position;
varPos.y = 0.51f;
m_camera.DOMove(varPos, 1.0f).onComplete = delegate () {
DelayPlayCameraAni();
};
}
//镜头向上移动
void CameraMoveUp()
{
m_sq = DOTween.Sequence();
m_sq.Append(m_camera.DOLocalMove(m_cameraPos, 1.0f));
m_sq.Join(m_camera.DOLocalRotateQuaternion(Quaternion.identity, 1.0f));
m_sq.AppendCallback(StartTake);
}
//播放take动画
void StartTake()
{
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
......@@ -338,10 +348,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayFiveAnim(GlobalConfig.Ani_Take);
}
Invoke("DelayBindRightNode", 1.0f);
m_sq = DOTween.Sequence();
m_sq.Append(m_camera.DOLocalMove(m_cameraPos, 1.625f));
m_sq.Join(m_camera.DOLocalRotateQuaternion(Quaternion.identity, 1.625f));
m_sq.AppendCallback(NextStart);
Invoke("NextStart", 1.625f);
}
//延迟绑定手节点
void DelayBindRightNode()
......@@ -422,7 +429,6 @@ public class SelectLevelCtrl : MonoBehaviour
//延迟播放镜头动画
void DelayPlayCameraAni()
{
HideAllRole();
//m_camera.DOLocalMove(m_FinalCameraPos, 0.5f).onComplete = delegate ()
//{
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
......@@ -464,7 +470,7 @@ public class SelectLevelCtrl : MonoBehaviour
//};
}
//隐藏所有角色
void HideAllRole()
public void HideAllRole()
{
m_girlTrans.gameObject.SetActive(false);
m_boyTrans.gameObject.SetActive(false);
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 050a9f35
......@@ -3390,7 +3390,7 @@ RectTransform:
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: 136, y: 136}
m_SizeDelta: {x: 128, y: 128}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7519324163330097713
CanvasRenderer:
......@@ -3419,7 +3419,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d1fc552763247c847908a1e1c3f7aa71, type: 3}
m_Sprite: {fileID: 21300000, guid: 9b57bd7e835cd874292b912c7e4eb4bc, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -3731,7 +3731,7 @@ RectTransform:
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: 136, y: 136}
m_SizeDelta: {x: 128, y: 128}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5838908090602587403
CanvasRenderer:
......@@ -3760,7 +3760,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 34318571850b11f438a5f78ee8d46e13, type: 3}
m_Sprite: {fileID: 21300000, guid: cc9a62a6b7ca5b34883f9375005d155c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -22711,7 +22711,7 @@ RectTransform:
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: 136, y: 136}
m_SizeDelta: {x: 128, y: 128}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1602523126898558043
CanvasRenderer:
......@@ -22740,7 +22740,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 61dfdfb72349a024fa9561d077b5e248, type: 3}
m_Sprite: {fileID: 21300000, guid: 6f6cf771819f5a14b9ba96a00662cb27, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......
3D Fruit/Assets/#B1_UIs/NewUI/吸管.png.meta 0 → 100644
View file @ 050a9f35
fileFormatVersion: 2
guid: 6f6cf771819f5a14b9ba96a00662cb27
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#B1_UIs/NewUI/柠檬.png.meta 0 → 100644
View file @ 050a9f35
fileFormatVersion: 2
guid: 9b57bd7e835cd874292b912c7e4eb4bc
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#B1_UIs/NewUI/纸伞.png.meta 0 → 100644
View file @ 050a9f35
fileFormatVersion: 2
guid: cc9a62a6b7ca5b34883f9375005d155c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/Res/Levels/SelectLevel.prefab
View file @ 050a9f35
......@@ -10961,7 +10961,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067851668704368399}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -0.327, y: 0, z: 0.44}
m_LocalPosition: {x: -0.327, y: 0.06, z: 0.44}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5120607848039669652}
......@@ -16139,7 +16139,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1358999568983398222}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -0.327, y: 0, z: 0.44}
m_LocalPosition: {x: -0.327, y: 0.06, z: 0.44}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8121285043489656519}
......@@ -23292,7 +23292,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3643751741678804717}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -0.327, y: 0, z: 0.44}
m_LocalPosition: {x: -0.327, y: 0.06, z: 0.44}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5634882160783324673}
......@@ -23543,7 +23543,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3946940721434224081}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0.1}
m_LocalPosition: {x: 0, y: 0.06, z: 0.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 198494324649018481}
......@@ -25303,7 +25303,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5815489839118293565}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -0.327, y: 0, z: 0.44}
m_LocalPosition: {x: -0.327, y: 0.06, z: 0.44}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1666420252514485013}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment