Skip to content

3
3D Fruit
Commit 7b30e35b authored by wanqing's avatar wanqing
Browse files
Options

修改流体逻辑

parent e3c58e3f
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 133 deletions
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ 7b30e35b
...@@ -229,137 +229,137 @@ public class FruitView : MonoBehaviour ...@@ -229,137 +229,137 @@ public class FruitView : MonoBehaviour
m_selectLst.Clear(); m_selectLst.Clear();
//流体特效 //流体特效
m_spriteRender.enabled = true; //m_spriteRender.enabled = true;
if(varStrawberryNum > 0) //if(varStrawberryNum > 0)
{ //{
if(varLemonNum > 0) // if(varLemonNum > 0)
{ // {
if(varOrangeNum > 0) // if(varOrangeNum > 0)
{ // {
m_animator.Play("juice_red"); // m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate // GameServices.timerServices.Push(this, 0.5f, delegate
{ // {
if (m_animator) // if (m_animator)
{ // {
m_animator.Play("juice_yellow"); // m_animator.Play("juice_yellow");
} // }
}); // });
GameServices.timerServices.Push(this, 1.0f, delegate // GameServices.timerServices.Push(this, 1.0f, delegate
{ // {
if (m_animator) // if (m_animator)
{ // {
m_animator.Play("juice_Orange"); // m_animator.Play("juice_Orange");
} // }
}); // });
GameServices.timerServices.Push(this, 1.5f, delegate // GameServices.timerServices.Push(this, 1.5f, delegate
{ // {
if (m_spriteRender) // if (m_spriteRender)
{ // {
m_spriteRender.enabled = false; // m_spriteRender.enabled = false;
} // }
}); // });
} // }
else // else
{ // {
m_animator.Play("juice_red"); // m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate // GameServices.timerServices.Push(this, 0.5f, delegate
{ // {
if (m_animator) // if (m_animator)
{ // {
m_animator.Play("juice_yellow"); // m_animator.Play("juice_yellow");
} // }
}); // });
GameServices.timerServices.Push(this, 1.0f, delegate // GameServices.timerServices.Push(this, 1.0f, delegate
{ // {
if (m_spriteRender) // if (m_spriteRender)
{ // {
m_spriteRender.enabled = false; // m_spriteRender.enabled = false;
} // }
}); // });
} // }
} // }
else // else
{ // {
if (varOrangeNum > 0) // if (varOrangeNum > 0)
{ // {
m_animator.Play("juice_red"); // m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate // GameServices.timerServices.Push(this, 0.5f, delegate
{ // {
if (m_animator) // if (m_animator)
{ // {
m_animator.Play("juice_Orange"); // m_animator.Play("juice_Orange");
} // }
}); // });
GameServices.timerServices.Push(this, 1.0f, delegate // GameServices.timerServices.Push(this, 1.0f, delegate
{ // {
if (m_spriteRender) // if (m_spriteRender)
{ // {
m_spriteRender.enabled = false; // m_spriteRender.enabled = false;
} // }
}); // });
} // }
else // else
{ // {
m_animator.Play("juice_red"); // m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate // GameServices.timerServices.Push(this, 0.5f, delegate
{ // {
if (m_spriteRender) // if (m_spriteRender)
{ // {
m_spriteRender.enabled = false; // m_spriteRender.enabled = false;
} // }
}); // });
} // }
} // }
} //}
else //else
{ //{
if (varLemonNum > 0) // if (varLemonNum > 0)
{ // {
if (varOrangeNum > 0) // if (varOrangeNum > 0)
{ // {
m_animator.Play("juice_yellow"); // m_animator.Play("juice_yellow");
GameServices.timerServices.Push(this, 0.5f, delegate // GameServices.timerServices.Push(this, 0.5f, delegate
{ // {
if (m_animator) // if (m_animator)
{ // {
m_animator.Play("juice_Orange"); // m_animator.Play("juice_Orange");
} // }
}); // });
GameServices.timerServices.Push(this, 1.0f, delegate // GameServices.timerServices.Push(this, 1.0f, delegate
{ // {
if (m_spriteRender) // if (m_spriteRender)
{ // {
m_spriteRender.enabled = false; // m_spriteRender.enabled = false;
} // }
}); // });
} // }
else // else
{ // {
m_animator.Play("juice_yellow"); // m_animator.Play("juice_yellow");
GameServices.timerServices.Push(this, 0.5f, delegate // GameServices.timerServices.Push(this, 0.5f, delegate
{ // {
if (m_spriteRender) // if (m_spriteRender)
{ // {
m_spriteRender.enabled = false; // m_spriteRender.enabled = false;
} // }
}); // });
} // }
} // }
else // else
{ // {
if (varOrangeNum > 0) // if (varOrangeNum > 0)
{ // {
m_animator.Play("juice_Orange"); // m_animator.Play("juice_Orange");
GameServices.timerServices.Push(this, 0.5f, delegate // GameServices.timerServices.Push(this, 0.5f, delegate
{ // {
if (m_spriteRender) // if (m_spriteRender)
{ // {
m_spriteRender.enabled = false; // m_spriteRender.enabled = false;
} // }
}); // });
} // }
} // }
} //}
//if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex || //if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex ||
// BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex) // BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
//{ //{
...@@ -385,6 +385,17 @@ public class FruitView : MonoBehaviour ...@@ -385,6 +385,17 @@ public class FruitView : MonoBehaviour
//} //}
Invoke("DelayCreate", 0.2f); Invoke("DelayCreate", 0.2f);
} }
//播放流体
public void ShowAnimator(string str)
{
m_spriteRender.enabled = true;
m_animator.Play(str);
}
//隐藏流体
public void HideAnimator()
{
m_spriteRender.enabled = false;
}
//延迟生成 //延迟生成
void DelayCreate() void DelayCreate()
{ {
......
3D Fruit/Assets/#A2_Scripts/Battle/View/GlassView.cs
View file @ 7b30e35b
...@@ -25,8 +25,12 @@ public class GlassView : MonoBehaviour ...@@ -25,8 +25,12 @@ public class GlassView : MonoBehaviour
private bool m_bControl = true; private bool m_bControl = true;
private float m_speed = 2.0f; private float m_speed = 2.0f;
private string m_strawberryAni = "juice_red";
private string m_lemonAni = "juice_yellow";
private string m_orangeAni = "juice_Orange";
private float m_startPos = 0.28f; private float m_startPos = 0.28f;
private FruitView m_fruitView;
private void Awake() private void Awake()
{ {
...@@ -37,6 +41,10 @@ public class GlassView : MonoBehaviour ...@@ -37,6 +41,10 @@ public class GlassView : MonoBehaviour
m_orange.gameObject.SetActive(false); m_orange.gameObject.SetActive(false);
} }
} }
private void Start()
{
m_fruitView = BattleCtrl.instance.levelManager.curLevel.fruitView;
}
//数量 //数量
public void SetFruitNum(int num1,int num2,int num3) public void SetFruitNum(int num1,int num2,int num3)
{ {
...@@ -92,6 +100,7 @@ public class GlassView : MonoBehaviour ...@@ -92,6 +100,7 @@ public class GlassView : MonoBehaviour
+ m_lemon.localScale.y*2.0f; + m_lemon.localScale.y*2.0f;
m_orange.localPosition = varOrangePos; m_orange.localPosition = varOrangePos;
} }
m_fruitView.ShowAnimator(m_strawberryAni);
} }
if(m_lemonOffest < m_lemonNum) if(m_lemonOffest < m_lemonNum)
{ {
...@@ -113,8 +122,9 @@ public class GlassView : MonoBehaviour ...@@ -113,8 +122,9 @@ public class GlassView : MonoBehaviour
+ m_lemon.localScale.y*2.0f; + m_lemon.localScale.y*2.0f;
m_orange.localPosition = varOrangePos; m_orange.localPosition = varOrangePos;
} }
m_fruitView.ShowAnimator(m_lemonAni);
} }
if(m_orangeOffest < m_orangeNum && m_orange) if (m_orangeOffest < m_orangeNum && m_orange)
{ {
m_orange.gameObject.SetActive(true); m_orange.gameObject.SetActive(true);
m_orangeOffest += Time.deltaTime * m_speed; m_orangeOffest += Time.deltaTime * m_speed;
...@@ -127,9 +137,14 @@ public class GlassView : MonoBehaviour ...@@ -127,9 +137,14 @@ public class GlassView : MonoBehaviour
varPos.y = m_startPos+m_strawberry.localScale.y*2.0f varPos.y = m_startPos+m_strawberry.localScale.y*2.0f
+ m_lemon.localScale.y*2.0f; + m_lemon.localScale.y*2.0f;
m_orange.localPosition = varPos; m_orange.localPosition = varPos;
m_fruitView.ShowAnimator(m_orangeAni);
} }
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex) if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{ {
if(m_strawberryOffest >= m_strawberryNum && m_lemonOffest >= m_lemonNum)
{
m_fruitView.HideAnimator();
}
if (m_strawberryOffest >= m_strawberryMaxNum && m_lemonOffest >= m_lemonMaxNum if (m_strawberryOffest >= m_strawberryMaxNum && m_lemonOffest >= m_lemonMaxNum
&& m_bControl) && m_bControl)
{ {
...@@ -140,6 +155,11 @@ public class GlassView : MonoBehaviour ...@@ -140,6 +155,11 @@ public class GlassView : MonoBehaviour
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex) || BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{ {
if (m_strawberryOffest >= m_strawberryNum && m_lemonOffest >= m_lemonNum
&& m_orangeOffest >= m_orangeNum)
{
m_fruitView.HideAnimator();
}
if (m_strawberryOffest >= m_strawberryMaxNum && m_lemonOffest >= m_lemonMaxNum if (m_strawberryOffest >= m_strawberryMaxNum && m_lemonOffest >= m_lemonMaxNum
&& m_orangeOffest >= m_orangeMaxNum && m_bControl) && m_orangeOffest >= m_orangeMaxNum && m_bControl)
{ {
......
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @ 7b30e35b
...@@ -1456,6 +1456,7 @@ MonoBehaviour: ...@@ -1456,6 +1456,7 @@ MonoBehaviour:
m_fruitParent: {fileID: 6664447788583718008} m_fruitParent: {fileID: 6664447788583718008}
m_highLightEffect: {fileID: 2419814893742932198} m_highLightEffect: {fileID: 2419814893742932198}
m_cutTrans: {fileID: 0} m_cutTrans: {fileID: 0}
m_cutSpeed: 3
--- !u!1 &2419814894024991057 --- !u!1 &2419814894024991057
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4669,6 +4670,16 @@ PrefabInstance: ...@@ -4669,6 +4670,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalScale.x
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalScale.z
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336399, guid: 7d9ffec4a1f76704f98876999774e4c7, - target: {fileID: 3803887659397336399, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3} type: 3}
propertyPath: m_WasSpriteAssigned propertyPath: m_WasSpriteAssigned
......
3D Fruit/Assets/Res/Levels/Level1.prefab
View file @ 7b30e35b
...@@ -1967,6 +1967,7 @@ MonoBehaviour: ...@@ -1967,6 +1967,7 @@ MonoBehaviour:
m_fruitParent: {fileID: 6664447788583718008} m_fruitParent: {fileID: 6664447788583718008}
m_highLightEffect: {fileID: 2419814893742932198} m_highLightEffect: {fileID: 2419814893742932198}
m_cutTrans: {fileID: 0} m_cutTrans: {fileID: 0}
m_cutSpeed: 3
--- !u!1 &2419814894024991057 --- !u!1 &2419814894024991057
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4827,7 +4828,7 @@ PrefabInstance: ...@@ -4827,7 +4828,7 @@ PrefabInstance:
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7, - target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -1.4 value: -1.27
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7, - target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3} type: 3}
...@@ -4874,6 +4875,16 @@ PrefabInstance: ...@@ -4874,6 +4875,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalScale.x
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalScale.z
value: 0.08
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7d9ffec4a1f76704f98876999774e4c7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 7d9ffec4a1f76704f98876999774e4c7, type: 3}
--- !u!95 &125640775644677710 stripped --- !u!95 &125640775644677710 stripped
......
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @ 7b30e35b
...@@ -4936,6 +4936,16 @@ PrefabInstance: ...@@ -4936,6 +4936,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalScale.x
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalScale.z
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336399, guid: 7d9ffec4a1f76704f98876999774e4c7, - target: {fileID: 3803887659397336399, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3} type: 3}
propertyPath: m_WasSpriteAssigned propertyPath: m_WasSpriteAssigned
......
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