Skip to content

3
3D Fruit
Commit 92e9e0ad authored by wanqing's avatar wanqing
Browse files
Options

修改粒子特效

parent 27a64692
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 38130 additions and 3406 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ 92e9e0ad
......@@ -166,7 +166,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
levelPrefs:
- {fileID: 8692181047053733938, guid: 90ed022fa9d48a64f910aad15b7faa2d, type: 3}
- {fileID: 8692181047053733938, guid: f7454de7619e58043bd3aad03242010a, type: 3}
- {fileID: 9081069388829900105, guid: 50002a8d201ddd64bb5b240aa652c3fa, type: 3}
--- !u!1 &543166196
GameObject:
......
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitItemView.cs
View file @ 92e9e0ad
......@@ -117,9 +117,38 @@ public class FruitItemView : MonoBehaviour
{
m_effect.transform.SetParent(null);
Vector3 varVec = transform.position;
float varX = varVec.x;
float varY = varVec.y;
varVec.z = 0;
varVec.y += 1.0f;
m_effect.transform.position = transform.position;
//varVec.y -= varY;
//if (m_type == FruitType.Strawberry)
//{
// if(varY > 0)
// {
// varVec.y += (1.0f + varY);
// }
// else
// {
// varVec.y -= (varY* varY + varY);
// }
//}
//else if (m_type == FruitType.Lemon)
//{
//}
//else if (m_type == FruitType.Orange)
//{
// varVec.y -= (1.3f + 3 * varY);
//}
if (varY > 0)
{
varVec.y += (1.0f + varY);
}
else
{
varVec.y -= (varY * varY);
}
varVec.x -= (10.0f - 3*varX);
m_effect.transform.position = varVec;
m_effect.transform.localRotation = m_liquidStartQua;
m_effect.transform.localScale = m_liquidStartScale;
m_effect.SetActive(false);
......
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ 92e9e0ad
......@@ -280,7 +280,7 @@ public class FruitView : MonoBehaviour
m_lemonEffect.SetActive(varLemonNum > 0);
m_orangeEffect.SetActive(false);
m_orangeEffect.SetActive(varOrangeNum > 0);
GameServices.timerServices.Push(this, 0.4f, delegate
GameServices.timerServices.Push(this, 1.0f, delegate
{
if (m_glassView)
{
......
3D Fruit/Assets/#A2_Scripts/Battle/View/GlassView.cs
View file @ 92e9e0ad
......@@ -8,6 +8,7 @@ public class GlassView : MonoBehaviour
public Transform m_lemon;//柠檬
public Transform m_orange;//橙子
public Transform m_effectPos;//特效位置
public Transform m_maskTrans;//遮罩
public Vector3 effectPos => m_effectPos.position;
private float m_strawberryOffest;
......@@ -105,6 +106,17 @@ public class GlassView : MonoBehaviour
m_orange.localPosition = varOrangePos;
}
//m_fruitView.ShowAnimator(m_strawberryAni);
//遮罩大小
Vector3 varMaskSize = m_maskTrans.localScale;
if(m_orange)
{
varSize.y = m_strawberry.localScale.y + m_lemon.localScale.y + m_orange.localScale.y;
}
else
{
varSize.y = m_strawberry.localScale.y + m_lemon.localScale.y;
}
m_maskTrans.localScale = varSize;
}
if(m_lemonOffest < m_lemonNum)
{
......@@ -126,6 +138,17 @@ public class GlassView : MonoBehaviour
+ m_lemon.localScale.y*2.0f;
m_orange.localPosition = varOrangePos;
}
//遮罩大小
Vector3 varMaskSize = m_maskTrans.localScale;
if (m_orange)
{
varSize.y = m_strawberry.localScale.y + m_lemon.localScale.y + m_orange.localScale.y;
}
else
{
varSize.y = m_strawberry.localScale.y + m_lemon.localScale.y;
}
m_maskTrans.localScale = varSize;
//m_fruitView.ShowAnimator(m_lemonAni);
}
if (m_orangeOffest < m_orangeNum && m_orange)
......@@ -141,6 +164,10 @@ public class GlassView : MonoBehaviour
varPos.y = m_startPos+m_strawberry.localScale.y*2.0f
+ m_lemon.localScale.y*2.0f;
m_orange.localPosition = varPos;
//遮罩大小
Vector3 varMaskSize = m_maskTrans.localScale;
varSize.y = m_strawberry.localScale.y + m_lemon.localScale.y + m_orange.localScale.y;
m_maskTrans.localScale = varSize;
//m_fruitView.ShowAnimator(m_orangeAni);
}
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 92e9e0ad
......@@ -6413,7 +6413,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 3
m_Text: '?'
--- !u!1 &5494452178133196282
GameObject:
m_ObjectHideFlags: 0
......@@ -12464,7 +12464,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -12481,7 +12481,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677159922112}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -12535,7 +12535,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677159922112}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......
3D Fruit/Assets/#A3_Prefabs/FruitPrefab/Lemon.prefab
View file @ 92e9e0ad
......@@ -690,6 +690,31 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.19999999
objectReference: {fileID: 0}
- target: {fileID: 5457342855710647603, guid: b69d063bc649621459f3f6dfc61f7052,
type: 3}
propertyPath: ShapeModule.radius.value
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5457342855710647603, guid: b69d063bc649621459f3f6dfc61f7052,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5457342855710647603, guid: b69d063bc649621459f3f6dfc61f7052,
type: 3}
propertyPath: InitialModule.startSpeed.minScalar
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5457342855710647603, guid: b69d063bc649621459f3f6dfc61f7052,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5457342855710647603, guid: b69d063bc649621459f3f6dfc61f7052,
type: 3}
propertyPath: EmissionModule.rateOverTime.scalar
value: 300
objectReference: {fileID: 0}
- target: {fileID: 5612450734186604735, guid: b69d063bc649621459f3f6dfc61f7052,
type: 3}
propertyPath: m_Name
......@@ -698,7 +723,7 @@ PrefabInstance:
- target: {fileID: 5612450734186604735, guid: b69d063bc649621459f3f6dfc61f7052,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b69d063bc649621459f3f6dfc61f7052, type: 3}
......
3D Fruit/Assets/#A3_Prefabs/FruitPrefab/Orange.prefab
View file @ 92e9e0ad
......@@ -708,7 +708,32 @@ PrefabInstance:
- target: {fileID: 3061406425104831238, guid: 4c52c24677a45134cbd74c8dd8781032,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4138964800474942021, guid: 4c52c24677a45134cbd74c8dd8781032,
type: 3}
propertyPath: ShapeModule.radius.value
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4138964800474942021, guid: 4c52c24677a45134cbd74c8dd8781032,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4138964800474942021, guid: 4c52c24677a45134cbd74c8dd8781032,
type: 3}
propertyPath: InitialModule.startSpeed.minScalar
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4138964800474942021, guid: 4c52c24677a45134cbd74c8dd8781032,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4138964800474942021, guid: 4c52c24677a45134cbd74c8dd8781032,
type: 3}
propertyPath: EmissionModule.rateOverTime.scalar
value: 300
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4c52c24677a45134cbd74c8dd8781032, type: 3}
......
3D Fruit/Assets/#A3_Prefabs/FruitPrefab/Strawberry.prefab
View file @ 92e9e0ad
......@@ -741,6 +741,31 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4487736285029228931}
m_Modifications:
- target: {fileID: 651200254161218379, guid: 86d793fcc14d0b944bb14a2bdda27029,
type: 3}
propertyPath: ShapeModule.radius.value
value: 5
objectReference: {fileID: 0}
- target: {fileID: 651200254161218379, guid: 86d793fcc14d0b944bb14a2bdda27029,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 3
objectReference: {fileID: 0}
- target: {fileID: 651200254161218379, guid: 86d793fcc14d0b944bb14a2bdda27029,
type: 3}
propertyPath: InitialModule.startSpeed.minScalar
value: 10
objectReference: {fileID: 0}
- target: {fileID: 651200254161218379, guid: 86d793fcc14d0b944bb14a2bdda27029,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 10
objectReference: {fileID: 0}
- target: {fileID: 651200254161218379, guid: 86d793fcc14d0b944bb14a2bdda27029,
type: 3}
propertyPath: EmissionModule.rateOverTime.scalar
value: 300
objectReference: {fileID: 0}
- target: {fileID: 3013782809957496098, guid: 86d793fcc14d0b944bb14a2bdda27029,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -819,7 +844,7 @@ PrefabInstance:
- target: {fileID: 6243340999333440279, guid: 86d793fcc14d0b944bb14a2bdda27029,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 86d793fcc14d0b944bb14a2bdda27029, type: 3}
......
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @ 92e9e0ad
This diff is collapsed.
3D Fruit/Assets/Res/Levels/Level1.prefab
View file @ 92e9e0ad
......@@ -374,6 +374,7 @@ MonoBehaviour:
m_lemon: {fileID: 3003594719321781977}
m_orange: {fileID: 1514922445319939476}
m_effectPos: {fileID: 1293173357704032413}
m_maskTrans: {fileID: 0}
--- !u!1 &1583171538080882383
GameObject:
m_ObjectHideFlags: 0
......@@ -2014,7 +2015,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_fruitView: {fileID: 6757771658655052171}
curLevelIndex: 1
curLevelIndex: 2
--- !u!114 &6757771658655052171
MonoBehaviour:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @ 92e9e0ad
This diff is collapsed.
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