Skip to content

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

修改流体逻辑

parent c680c2aa
Show whitespace changes
Inline Side-by-side
Showing with 207664 additions and 149331 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ f0fc7aed
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ f0fc7aed
......@@ -52,7 +52,7 @@ public class BattleUI : MonoBehaviour
public Text m_lemonGoalNum;
public Text m_orangeGoalNum;
public Text m_comboText;
public Text m_goodText;
public Image m_goodImage;
public LineUI m_lineUI;
public Transform m_starParent;//星级
public Sprite m_fullStarSprite;//满星星
......@@ -73,7 +73,9 @@ public class BattleUI : MonoBehaviour
public GameObject m_starFruitNumObj;
public GameObject m_starNoOtherObj;
public Text m_starLevel;
public Water2D_Spawner m_waterSpawner;
public GameObject m_waterCameraObj;
public Sprite m_goodSprite;
public Sprite m_excellentSprite;
public Action onStartBtn;
public Action onPosUpBtn;
public Action onPosDownBtn;
......@@ -94,7 +96,9 @@ public class BattleUI : MonoBehaviour
private float m_fadeAlpha = 0.0f;
private bool m_bSelectToMain = false;//选择场景跳到主场景
private bool m_bMainToSelect = false;//主场景跳到选择场景
public bool bMainToSelect => m_bMainToSelect;
private bool m_bfadeState = false;
public bool bfadeState => m_bfadeState;
private bool m_bLoadSceneFinish = false;//场景是否加载完成
private int m_startIndex = 0;//点击开始次数
private GameObject m_cameraRenderObj;
......@@ -748,24 +752,24 @@ public class BattleUI : MonoBehaviour
//设置good表现
public void SetGoodShow(int num)
{
string str = "";
Sprite str;
if(num > 0)
{
if (num <= 1)
{
str = "Good";
str = m_goodSprite;
}
else
{
str = "Excellent";
str = m_excellentSprite;
}
m_goodText.text = str;
CanvasGroupFade varCanvas = m_goodText.GetComponent<CanvasGroupFade>();
m_goodImage.sprite = str;
CanvasGroupFade varCanvas = m_goodImage.GetComponent<CanvasGroupFade>();
if (varCanvas)
{
varCanvas.ResetState();
}
m_goodText.gameObject.SetActive(true);
m_goodImage.gameObject.SetActive(true);
}
}
void MoveFinish()
......@@ -842,6 +846,7 @@ public class BattleUI : MonoBehaviour
m_bLoadSceneFinish = false;
m_fadeAlpha = 0.0f;
m_bSelectToMain = false;
m_waterCameraObj.SetActive(true);
}
}
}
......@@ -862,6 +867,8 @@ public class BattleUI : MonoBehaviour
BattleCtrl.instance.levelManager.SetSelectLevelState(true);
PoolManager.Instance.ReturnObjectToPool(m_cameraRenderObj);
BattleCtrl.instance.levelManager.curLevel.fruitView.RecycleSmallBall();
m_waterCameraObj.SetActive(false);
BattleCtrl.instance.levelManager.curLevel.fruitView.DelayClearWaterEffect();
}
}
else
......
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ f0fc7aed
......@@ -52,7 +52,16 @@ public class FruitView : MonoBehaviour
//小球处理
private List<GameObject> m_smallBallLst = new List<GameObject>();
private List<Vector3> m_smallBallPosLst = new List<Vector3>();
private float m_fruitSpeed = 0.0f;
//水特效处理
private int m_starwberryOneNum;
private int m_starwberryTwoNum;
private int m_starwberryThreeNum;
private int m_lemonOneNum;
private int m_lemonTwoNum;
private int m_lemonThreeNum;
private int m_orangeOneNum;
private int m_orangeTwoNum;
private int m_orangeThreeNum;
private void Awake()
{
//if (m_animator)
......@@ -210,7 +219,9 @@ public class FruitView : MonoBehaviour
int varStrawberryNum = 0;
int varLemonNum = 0;
int varOrangeNum = 0;
m_waterStarwberryLst.Clear();
m_waterLemonLst.Clear();
m_waterOrangeLst.Clear();
for (int i = 0; i < m_selectLst.Count; i++)
{
m_selectLst[i].SetFrag();
......@@ -276,29 +287,92 @@ public class FruitView : MonoBehaviour
varVec.x += m_waterStarwberryLst[i].position.x;
varVec.y += m_waterStarwberryLst[i].position.y;
}
if(m_waterStarwberryLst.Count > 1)
{
varVec.x /= 2;
varVec.y /= 2;
if (varVec.x < 0)
}
//if (varVec.x < 0)
//{
varVec.x += varVec.x*2.0f;
//}
//else
//{
// varVec.x += 0.5f;
//}
varVec.y += 0.3f;
GameObject varWaterEffect = null;
if(varStrawberryNum == 1)
{
varVec.x -= 0.5f;
m_starwberryOneNum++;
if(m_starwberryOneNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_1Obj);
}
else
else if (m_starwberryOneNum == 2)
{
varVec.x += 0.5f;
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_2Obj);
}
varVec.y += 1.0f;
GameObject varWaterEffect = null;
if(varStrawberryNum == 1)
else if (m_starwberryOneNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberryObj);
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_3Obj);
}
else if (m_starwberryOneNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_4Obj);
}
else if (m_starwberryOneNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_5Obj);
}
}
else if(varStrawberryNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1Obj);
m_starwberryTwoNum++;
if (m_starwberryTwoNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry2_1Obj);
}
else if (m_starwberryTwoNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry2_2Obj);
}
else if (m_starwberryTwoNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry2_3Obj);
}
else if (m_starwberryTwoNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry2_4Obj);
}
else if (m_starwberryTwoNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry2_5Obj);
}
}
else
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry2Obj);
m_starwberryThreeNum++;
if(m_starwberryThreeNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry3_1Obj);
}
else if (m_starwberryThreeNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry3_2Obj);
}
else if (m_starwberryThreeNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry3_3Obj);
}
else if (m_starwberryThreeNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry3_4Obj);
}
else if (m_starwberryThreeNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry3_5Obj);
}
}
varWaterEffect.transform.position = varVec;
Water2D_Spawner varWater = varWaterEffect.GetComponent<Water2D_Spawner>();
......@@ -320,29 +394,92 @@ public class FruitView : MonoBehaviour
varVec.x += m_waterLemonLst[i].position.x;
varVec.y += m_waterLemonLst[i].position.y;
}
if(m_waterLemonLst.Count > 1)
{
varVec.x /= 2;
varVec.y /= 2;
if (varVec.x < 0)
{
varVec.x -= 0.5f;
}
else
//if (varVec.x < 0)
{
varVec.x += 0.5f;
varVec.x += varVec.x * 2.0f;
}
varVec.y += 1.0f;
//else
//{
// varVec.x += 0.5f;
//}
varVec.y += 0.3f;
GameObject varWaterEffect = null;
if (varLemonNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemonObj);
m_lemonOneNum++;
if(m_lemonOneNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_1Obj);
}
else if (m_lemonOneNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_2Obj);
}
else if (m_lemonOneNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_3Obj);
}
else if (m_lemonOneNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_4Obj);
}
else if (m_lemonOneNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_5Obj);
}
}
else if (varLemonNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1Obj);
m_lemonTwoNum++;
if(m_lemonTwoNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon2_1Obj);
}
else if (m_lemonTwoNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon2_2Obj);
}
else if (m_lemonTwoNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon2_3Obj);
}
else if (m_lemonTwoNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon2_4Obj);
}
else if (m_lemonTwoNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon2_5Obj);
}
}
else
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon2Obj);
m_lemonThreeNum++;
if(m_lemonThreeNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon3_1Obj);
}
else if (m_lemonThreeNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon3_2Obj);
}
else if (m_lemonThreeNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon3_3Obj);
}
else if (m_lemonThreeNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon3_4Obj);
}
else if (m_lemonThreeNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon3_5Obj);
}
}
varWaterEffect.transform.position = varVec;
Water2D_Spawner varWater = varWaterEffect.GetComponent<Water2D_Spawner>();
......@@ -361,29 +498,92 @@ public class FruitView : MonoBehaviour
varVec.x += m_waterOrangeLst[i].position.x;
varVec.y += m_waterOrangeLst[i].position.y;
}
if(m_waterOrangeLst.Count > 1)
{
varVec.x /= 2;
varVec.y /= 2;
if (varVec.x < 0)
{
varVec.x -= 0.5f;
}
else
//if (varVec.x < 0)
{
varVec.x += 0.5f;
varVec.x += varVec.x * 2.0f;
}
varVec.y += 1.0f;
//else
//{
// varVec.x += 0.5f;
//}
varVec.y += 0.3f;
GameObject varWaterEffect = null;
if (varOrangeNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrangeObj);
m_orangeOneNum++;
if(m_orangeOneNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_1Obj);
}
else if (m_orangeOneNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_2Obj);
}
else if (m_orangeOneNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_3Obj);
}
else if (m_orangeOneNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_4Obj);
}
else if (m_orangeOneNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_5Obj);
}
}
else if (varOrangeNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1Obj);
m_orangeTwoNum++;
if(m_orangeTwoNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange2_1Obj);
}
else if (m_orangeTwoNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange2_2Obj);
}
else if (m_orangeTwoNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange2_3Obj);
}
else if (m_orangeTwoNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange2_4Obj);
}
else if (m_orangeTwoNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange2_5Obj);
}
}
else
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange2Obj);
m_orangeThreeNum++;
if(m_orangeThreeNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange3_1Obj);
}
else if (m_orangeThreeNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange3_2Obj);
}
else if (m_orangeThreeNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange3_3Obj);
}
else if (m_orangeThreeNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange3_4Obj);
}
else if (m_orangeThreeNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange3_5Obj);
}
}
varWaterEffect.transform.position = varVec;
Water2D_Spawner varWater = varWaterEffect.GetComponent<Water2D_Spawner>();
......@@ -397,7 +597,7 @@ public class FruitView : MonoBehaviour
m_SelectNum = m_selectLst.Count;
Invoke("DelayClear", 0.5f);
Invoke("DelayClearEffect", 1.0f);
Invoke("DelayClearWaterEffect", 3.0f);
//Invoke("DelayClearWaterEffect", 3.0f);
}
//延迟判断失败
void DelayFail()
......@@ -409,7 +609,7 @@ public class FruitView : MonoBehaviour
}
}
//延迟删除水特效
void DelayClearWaterEffect()
public void DelayClearWaterEffect()
{
for (int i = 0; i < m_waterEffect.Count; i++)
{
......@@ -545,12 +745,12 @@ public class FruitView : MonoBehaviour
//播放特效
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
m_strawberryEffect.SetActive(false);
//m_strawberryEffect.SetActive(varStrawberryNum > 0);
m_lemonEffect.SetActive(false);
//m_lemonEffect.SetActive(varLemonNum > 0);
m_orangeEffect.SetActive(false);
m_orangeEffect.SetActive(varStrawberryNum > 0 || varLemonNum > 0 || varOrangeNum > 0);
//m_strawberryEffect.SetActive(false);
////m_strawberryEffect.SetActive(varStrawberryNum > 0);
//m_lemonEffect.SetActive(false);
////m_lemonEffect.SetActive(varLemonNum > 0);
//m_orangeEffect.SetActive(false);
//m_orangeEffect.SetActive(varStrawberryNum > 0 || varLemonNum > 0 || varOrangeNum > 0);
BattleCtrl.instance.battleUI.SetNeedIconNum(m_fruitTotalNum);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
......
3D Fruit/Assets/#A2_Scripts/Battle/View/GlassView.cs
View file @ f0fc7aed
......@@ -66,11 +66,13 @@ public class GlassView : MonoBehaviour
public void SetFruitNum(int num1,int num2,int num3)
{
m_fruitNum += num1 + num2 + num3;
if(m_fruitNum >= GlobalConfig.ProgressFruitNumNeed)
BattleCtrl.instance.levelManager.curLevel.progressFruitNum = (int)m_fruitNum;
if (m_fruitNum >= GlobalConfig.ProgressFruitNumNeed)
{
m_fruitNum = GlobalConfig.ProgressFruitNumNeed;
BattleCtrl.instance.levelManager.curLevel.CalculateStar();
BattleCtrl.instance.OnBattleWin();
}
BattleCtrl.instance.levelManager.curLevel.progressFruitNum = (int)m_fruitNum;
//m_strawberryNum += num1;
//if (m_strawberryNum >= GlobalConfig.StrawberryRandomNum)
//{
......@@ -99,25 +101,25 @@ public class GlassView : MonoBehaviour
{
return;
}
if(m_strawberryOffest < m_fruitNum)
{
m_strawberry.gameObject.SetActive(true);
m_strawberryOffest += Time.deltaTime * m_speed;
//if(m_strawberryOffest < m_fruitNum)
//{
// m_strawberry.gameObject.SetActive(true);
// m_strawberryOffest += Time.deltaTime * m_speed;
Vector3 varSize = m_strawberry.localScale;
varSize.y = m_strawberryOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
m_strawberry.localScale = varSize;
// Vector3 varSize = m_strawberry.localScale;
// varSize.y = m_strawberryOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
// m_strawberry.localScale = varSize;
//草莓位置
Vector3 varPosStrawberry = m_strawberry.localPosition;
varPosStrawberry.y = m_startPos;
m_strawberry.localPosition = varPosStrawberry;
// //草莓位置
// Vector3 varPosStrawberry = m_strawberry.localPosition;
// varPosStrawberry.y = m_startPos;
// m_strawberry.localPosition = varPosStrawberry;
//遮罩大小
Vector3 varMaskSize = m_maskTrans.localScale;
varSize.y = m_strawberry.localScale.y;
m_maskTrans.localScale = varSize;
}
// //遮罩大小
// Vector3 varMaskSize = m_maskTrans.localScale;
// varSize.y = m_strawberry.localScale.y;
// m_maskTrans.localScale = varSize;
//}
//if (m_strawberryOffest < m_sportNum)
//{
// m_strawberry.gameObject.SetActive(true);
......@@ -242,12 +244,12 @@ public class GlassView : MonoBehaviour
// BattleCtrl.instance.levelManager.curLevel.CalculateStar();
// BattleCtrl.instance.OnBattleWin();
//}
if(m_strawberryOffest >= GlobalConfig.ProgressFruitNumNeed && m_bControl)
{
m_bControl = false;
BattleCtrl.instance.levelManager.curLevel.CalculateStar();
BattleCtrl.instance.OnBattleWin();
}
//if(m_strawberryOffest >= GlobalConfig.ProgressFruitNumNeed && m_bControl)
//{
// m_bControl = false;
// BattleCtrl.instance.levelManager.curLevel.CalculateStar();
// BattleCtrl.instance.OnBattleWin();
//}
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
......
3D Fruit/Assets/#A2_Scripts/Pool/CacheManager.cs
View file @ f0fc7aed
......@@ -51,23 +51,95 @@ public class CacheManager : MonoBehaviour
[SerializeField]
private GameObject m_cmobo3EffectObj;//cmobo3
[SerializeField]
private GameObject m_waterStarwberryObj;//水插件草莓
private GameObject m_waterStarwberry1_1Obj;//水插件草莓1
[SerializeField]
private GameObject m_waterStarwberry1Obj;//水插件草莓
private GameObject m_waterStarwberry1_2Obj;
[SerializeField]
private GameObject m_waterStarwberry2Obj;//水插件草莓
private GameObject m_waterStarwberry1_3Obj;
[SerializeField]
private GameObject m_waterLemonObj;//水插件柠檬
private GameObject m_waterStarwberry1_4Obj;
[SerializeField]
private GameObject m_waterLemon1Obj;//水插件柠檬
private GameObject m_waterStarwberry1_5Obj;
[SerializeField]
private GameObject m_waterLemon2Obj;//水插件柠檬
private GameObject m_waterStarwberry2_1Obj;//水插件草莓2
[SerializeField]
private GameObject m_waterOrangeObj;//水插件橙子
private GameObject m_waterStarwberry2_2Obj;
[SerializeField]
private GameObject m_waterOrange1Obj;//水插件橙子
private GameObject m_waterStarwberry2_3Obj;
[SerializeField]
private GameObject m_waterOrange2Obj;//水插件橙子
private GameObject m_waterStarwberry2_4Obj;
[SerializeField]
private GameObject m_waterStarwberry2_5Obj;
[SerializeField]
private GameObject m_waterStarwberry3_1Obj;//水插件草莓3
[SerializeField]
private GameObject m_waterStarwberry3_2Obj;
[SerializeField]
private GameObject m_waterStarwberry3_3Obj;
[SerializeField]
private GameObject m_waterStarwberry3_4Obj;
[SerializeField]
private GameObject m_waterStarwberry3_5Obj;
[SerializeField]
private GameObject m_waterLemon1_1Obj;//水插件柠檬1
[SerializeField]
private GameObject m_waterLemon1_2Obj;
[SerializeField]
private GameObject m_waterLemon1_3Obj;
[SerializeField]
private GameObject m_waterLemon1_4Obj;
[SerializeField]
private GameObject m_waterLemon1_5Obj;
[SerializeField]
private GameObject m_waterLemon2_1Obj;//水插件柠檬2
[SerializeField]
private GameObject m_waterLemon2_2Obj;
[SerializeField]
private GameObject m_waterLemon2_3Obj;
[SerializeField]
private GameObject m_waterLemon2_4Obj;
[SerializeField]
private GameObject m_waterLemon2_5Obj;
[SerializeField]
private GameObject m_waterLemon3_1Obj;//水插件柠檬3
[SerializeField]
private GameObject m_waterLemon3_2Obj;
[SerializeField]
private GameObject m_waterLemon3_3Obj;
[SerializeField]
private GameObject m_waterLemon3_4Obj;
[SerializeField]
private GameObject m_waterLemon3_5Obj;
[SerializeField]
private GameObject m_waterOrange1_1Obj;//水插件橙子1
[SerializeField]
private GameObject m_waterOrange1_2Obj;
[SerializeField]
private GameObject m_waterOrange1_3Obj;
[SerializeField]
private GameObject m_waterOrange1_4Obj;
[SerializeField]
private GameObject m_waterOrange1_5Obj;
[SerializeField]
private GameObject m_waterOrange2_1Obj;//水插件橙子2
[SerializeField]
private GameObject m_waterOrange2_2Obj;
[SerializeField]
private GameObject m_waterOrange2_3Obj;
[SerializeField]
private GameObject m_waterOrange2_4Obj;
[SerializeField]
private GameObject m_waterOrange2_5Obj;
[SerializeField]
private GameObject m_waterOrange3_1Obj;//水插件橙子3
[SerializeField]
private GameObject m_waterOrange3_2Obj;
[SerializeField]
private GameObject m_waterOrange3_3Obj;
[SerializeField]
private GameObject m_waterOrange3_4Obj;
[SerializeField]
private GameObject m_waterOrange3_5Obj;
public GameObject lineObj => m_lineObj;
public GameObject LemonObj => m_LemonObj;
public GameObject OrangeObj => m_OrangeObj;
......@@ -91,15 +163,51 @@ public class CacheManager : MonoBehaviour
public GameObject cmobo1EffectObj => m_cmobo1EffectObj;
public GameObject cmobo2EffectObj => m_cmobo2EffectObj;
public GameObject cmobo3EffectObj => m_cmobo3EffectObj;
public GameObject waterStarwberryObj => m_waterStarwberryObj;
public GameObject waterStarwberry1Obj => m_waterStarwberry1Obj;
public GameObject waterStarwberry2Obj => m_waterStarwberry2Obj;
public GameObject waterLemonObj => m_waterLemonObj;
public GameObject waterLemon1Obj => m_waterLemon1Obj;
public GameObject waterLemon2Obj => m_waterLemon2Obj;
public GameObject waterOrangeObj => m_waterOrangeObj;
public GameObject waterOrange1Obj => m_waterOrange1Obj;
public GameObject waterOrange2Obj => m_waterOrange2Obj;
public GameObject waterStarwberry1_1Obj => m_waterStarwberry1_1Obj;
public GameObject waterStarwberry1_2Obj => m_waterStarwberry1_2Obj;
public GameObject waterStarwberry1_3Obj => m_waterStarwberry1_3Obj;
public GameObject waterStarwberry1_4Obj => m_waterStarwberry1_4Obj;
public GameObject waterStarwberry1_5Obj => m_waterStarwberry1_5Obj;
public GameObject waterStarwberry2_1Obj => m_waterStarwberry2_1Obj;
public GameObject waterStarwberry2_2Obj => m_waterStarwberry2_2Obj;
public GameObject waterStarwberry2_3Obj => m_waterStarwberry2_3Obj;
public GameObject waterStarwberry2_4Obj => m_waterStarwberry2_4Obj;
public GameObject waterStarwberry2_5Obj => m_waterStarwberry2_5Obj;
public GameObject waterStarwberry3_1Obj => m_waterStarwberry3_1Obj;
public GameObject waterStarwberry3_2Obj => m_waterStarwberry3_2Obj;
public GameObject waterStarwberry3_3Obj => m_waterStarwberry3_3Obj;
public GameObject waterStarwberry3_4Obj => m_waterStarwberry3_4Obj;
public GameObject waterStarwberry3_5Obj => m_waterStarwberry3_5Obj;
public GameObject waterLemon1_1Obj => m_waterLemon1_1Obj;
public GameObject waterLemon1_2Obj => m_waterLemon1_2Obj;
public GameObject waterLemon1_3Obj => m_waterLemon1_3Obj;
public GameObject waterLemon1_4Obj => m_waterLemon1_4Obj;
public GameObject waterLemon1_5Obj => m_waterLemon1_5Obj;
public GameObject waterLemon2_1Obj => m_waterLemon2_1Obj;
public GameObject waterLemon2_2Obj => m_waterLemon2_2Obj;
public GameObject waterLemon2_3Obj => m_waterLemon2_3Obj;
public GameObject waterLemon2_4Obj => m_waterLemon2_4Obj;
public GameObject waterLemon2_5Obj => m_waterLemon2_5Obj;
public GameObject waterLemon3_1Obj => m_waterLemon3_1Obj;
public GameObject waterLemon3_2Obj => m_waterLemon3_2Obj;
public GameObject waterLemon3_3Obj => m_waterLemon3_3Obj;
public GameObject waterLemon3_4Obj => m_waterLemon3_4Obj;
public GameObject waterLemon3_5Obj => m_waterLemon3_5Obj;
public GameObject waterOrange1_1Obj => m_waterOrange1_1Obj;
public GameObject waterOrange1_2Obj => m_waterOrange1_2Obj;
public GameObject waterOrange1_3Obj => m_waterOrange1_3Obj;
public GameObject waterOrange1_4Obj => m_waterOrange1_4Obj;
public GameObject waterOrange1_5Obj => m_waterOrange1_5Obj;
public GameObject waterOrange2_1Obj => m_waterOrange2_1Obj;
public GameObject waterOrange2_2Obj => m_waterOrange2_2Obj;
public GameObject waterOrange2_3Obj => m_waterOrange2_3Obj;
public GameObject waterOrange2_4Obj => m_waterOrange2_4Obj;
public GameObject waterOrange2_5Obj => m_waterOrange2_5Obj;
public GameObject waterOrange3_1Obj => m_waterOrange3_1Obj;
public GameObject waterOrange3_2Obj => m_waterOrange3_2Obj;
public GameObject waterOrange3_3Obj => m_waterOrange3_3Obj;
public GameObject waterOrange3_4Obj => m_waterOrange3_4Obj;
public GameObject waterOrange3_5Obj => m_waterOrange3_5Obj;
public static CacheManager Instance = null;
void Awake()
{
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ f0fc7aed
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @ f0fc7aed
......@@ -233,69 +233,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_type: 2
m_effect: {fileID: 0}
--- !u!1 &653391154301170872
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8818397869252783219}
- component: {fileID: 7472536336219686222}
m_Layer: 0
m_Name: Collider (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8818397869252783219
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 653391154301170872}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.37, y: -6.72, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2228437097257834197}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &7472536336219686222
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 653391154301170872}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -4.129364, y: 4.940155}
- {x: -7.183381, y: 4.590682}
- {x: -2.6441774, y: 0.09060097}
- {x: -1.3001957, y: -1.1968307}
- {x: 0.06904459, y: -1.457089}
- {x: 0.39629102, y: -1.0020208}
- {x: 0.56449056, y: 0.19253302}
--- !u!1 &1168822253320322843
GameObject:
m_ObjectHideFlags: 0
......@@ -408,68 +345,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &1220879264754492768
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8133358085093883382}
- component: {fileID: 2162100324470414223}
m_Layer: 0
m_Name: Collider (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8133358085093883382
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1220879264754492768}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.02, y: -7.81, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2228437097257834197}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &2162100324470414223
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1220879264754492768}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.06389949, y: 0.88238335}
- {x: -0.52560574, y: 0.79392767}
- {x: -0.56002885, y: -0.067834854}
- {x: -0.11345342, y: -0.47615004}
- {x: 0.44761053, y: -0.17314863}
- {x: 0.42774984, y: 0.76766443}
--- !u!1 &1342045827474825340
GameObject:
m_ObjectHideFlags: 0
......@@ -652,6 +527,70 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!1 &1617316875549926354
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1126455323151030519}
- component: {fileID: 8593863129735601842}
m_Layer: 0
m_Name: Collider (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1126455323151030519
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617316875549926354}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.9, y: -19.51, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5332178590545132912}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &8593863129735601842
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617316875549926354}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 1.7715682, y: 2.797348}
- {x: 1.4904402, y: 4.1782265}
- {x: -3.3168702, y: 4.197733}
- {x: -3.7477307, y: 2.782299}
- {x: -1.4640676, y: 2.3778286}
- {x: -0.4812889, y: 2.2421455}
- {x: 0.3952198, y: 2.3396091}
- {x: 1.3644868, y: 2.5013695}
--- !u!1 &2063074336016264972
GameObject:
m_ObjectHideFlags: 0
......@@ -781,69 +720,6 @@ CapsuleCollider:
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!1 &2099419118403936155
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7047461713587050638}
- component: {fileID: 7943101714428577591}
m_Layer: 0
m_Name: Collider (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7047461713587050638
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2099419118403936155}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2, y: -14.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2228437097257834197}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &7943101714428577591
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2099419118403936155}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.5035312, y: 4.8091364}
- {x: -0.9936366, y: 6.9269543}
- {x: -1.5101962, y: 5.9974623}
- {x: -1.8046558, y: 1.914669}
- {x: -1.5620072, y: -2.1092377}
- {x: -0.6161847, y: -2.1786308}
- {x: -0.2599814, y: -1.8462944}
--- !u!1 &2170282659989292885
GameObject:
m_ObjectHideFlags: 0
......@@ -1122,43 +998,6 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!1 &2312811239556570847
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2228437097257834197}
m_Layer: 0
m_Name: 2DColliderGP
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2228437097257834197
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2312811239556570847}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.64, z: 0.32}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.1}
m_Children:
- {fileID: 4977579475787362784}
- {fileID: 8818397869252783219}
- {fileID: 8133358085093883382}
- {fileID: 4115317485809841020}
- {fileID: 7047461713587050638}
- {fileID: 3630512415720678602}
- {fileID: 7738232878222811271}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2419814892866602943
GameObject:
m_ObjectHideFlags: 0
......@@ -3600,7 +3439,7 @@ Transform:
- {fileID: 2419814893835863036}
- {fileID: 3473518863980440133}
- {fileID: 2419814894656923382}
- {fileID: 2228437097257834197}
- {fileID: 5332178590545132912}
m_Father: {fileID: 2419814893974238167}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -4095,16 +3934,78 @@ CapsuleCollider2D:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2710795166410478486}
m_GameObject: {fileID: 2710795166410478486}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.0000019669533, y: -3.1763736e-22}
m_Size: {x: 1.0000002, y: 2.0000005}
m_Direction: 0
--- !u!1 &2792705213473601542
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6310447531794864167}
- component: {fileID: 4125668458053920572}
m_Layer: 0
m_Name: Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6310447531794864167
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2792705213473601542}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.57, y: -6.72, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5332178590545132912}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &4125668458053920572
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2792705213473601542}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.0000019669533, y: -3.1763736e-22}
m_Size: {x: 1.0000002, y: 2.0000005}
m_Direction: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 5.794328, y: 4.579209}
- {x: 3.2366152, y: 5.208303}
- {x: -1.3666914, y: 0.28980398}
- {x: -1.624429, y: -0.793725}
- {x: -1.2389681, y: -1.4142365}
- {x: 0.13899231, y: -1.1761737}
--- !u!1 &2862435927594806671
GameObject:
m_ObjectHideFlags: 0
......@@ -4556,70 +4457,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &3298925094615349742
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7738232878222811271}
- component: {fileID: 3101834039113356569}
m_Layer: 0
m_Name: Collider (6)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7738232878222811271
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3298925094615349742}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.9, y: 0, z: 0}
m_LocalScale: {x: 10, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2228437097257834197}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &3101834039113356569
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3298925094615349742}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 1.7715682, y: 2.797348}
- {x: 1.4904402, y: 4.1782265}
- {x: -3.3168702, y: 4.197733}
- {x: -3.7477307, y: 2.782299}
- {x: -1.4640676, y: 2.3778286}
- {x: -0.4812889, y: 2.2421455}
- {x: 0.3952198, y: 2.3396091}
- {x: 1.3644868, y: 2.5013695}
--- !u!1 &3473518863980440134
GameObject:
m_ObjectHideFlags: 0
......@@ -4958,6 +4795,71 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &3977060018799000513
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8675982677168821939}
- component: {fileID: 2167623035458344459}
m_Layer: 0
m_Name: Collider (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8675982677168821939
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3977060018799000513}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2, y: -14.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5332178590545132912}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &2167623035458344459
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3977060018799000513}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.2764318, y: -1.6192265}
- {x: -0.0033659935, y: 4.72715}
- {x: -0.5035312, y: 4.8091364}
- {x: -0.9936366, y: 6.9269543}
- {x: -1.5101962, y: 5.9974623}
- {x: -1.8046558, y: 1.914669}
- {x: -1.5620072, y: -2.1092377}
- {x: -0.6161847, y: -2.1786308}
- {x: -0.2599814, y: -1.8462944}
--- !u!1 &4002404457533025462
GameObject:
m_ObjectHideFlags: 0
......@@ -9835,69 +9737,6 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &4284115447703345944
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4115317485809841020}
- component: {fileID: 1525295932604215031}
m_Layer: 0
m_Name: Collider (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4115317485809841020
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4284115447703345944}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.57, y: -14.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2228437097257834197}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &1525295932604215031
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4284115447703345944}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.47998953, y: 6.067669}
- {x: -1.6588964, y: 7.163183}
- {x: -2.0669496, y: 4.83502}
- {x: -1.8046558, y: 1.914669}
- {x: -1.8197842, y: -2.109373}
- {x: -1.0960312, y: -2.2521267}
- {x: -0.7481475, y: -1.7787323}
--- !u!1 &4357678878227585032
GameObject:
m_ObjectHideFlags: 0
......@@ -10667,7 +10506,7 @@ Transform:
m_Father: {fileID: 6319510659133812683}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5397520059128903647
--- !u!1 &5020444709776606388
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -10675,36 +10514,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3630512415720678602}
- component: {fileID: 9187785952661131269}
- component: {fileID: 1302569291776586926}
- component: {fileID: 4591999113512903034}
m_Layer: 0
m_Name: Collider (5)
m_Name: Collider (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3630512415720678602
m_IsActive: 1
--- !u!4 &1302569291776586926
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5397520059128903647}
m_GameObject: {fileID: 5020444709776606388}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.9, y: -19.39, z: 0}
m_LocalPosition: {x: 0.02, y: -7.81, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2228437097257834197}
m_RootOrder: 5
m_Father: {fileID: 5332178590545132912}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &9187785952661131269
--- !u!60 &4591999113512903034
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5397520059128903647}
m_GameObject: {fileID: 5020444709776606388}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
......@@ -10723,14 +10562,12 @@ PolygonCollider2D:
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 1.7715682, y: 2.797348}
- {x: 1.4904402, y: 4.1782265}
- {x: -3.3168702, y: 4.197733}
- {x: -3.7477307, y: 2.782299}
- {x: -1.4640676, y: 2.3778286}
- {x: -0.4812889, y: 2.2421455}
- {x: 0.3952198, y: 2.3396091}
- {x: 1.3644868, y: 2.5013695}
- - {x: -0.06389949, y: 0.88238335}
- {x: -0.52560574, y: 0.79392767}
- {x: -0.56002885, y: -0.067834854}
- {x: -0.11345342, y: -0.47615004}
- {x: 0.44761053, y: -0.17314863}
- {x: 0.42774984, y: 0.76766443}
--- !u!1 &5406383656989081685
GameObject:
m_ObjectHideFlags: 0
......@@ -11073,26 +10910,90 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5537882261351490957}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67d4de287b46eb34e83a61e4f9115070, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1146599377617852504
MonoBehaviour:
m_GameObject: {fileID: 5537882261351490957}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67d4de287b46eb34e83a61e4f9115070, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1146599377617852504
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5537882261351490957}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ce0afadfd77b3b40bf16a06353f4b73, type: 3}
m_Name:
m_EditorClassIdentifier:
m_type: 3
m_effect: {fileID: 0}
--- !u!1 &5690882831837796157
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6749958264563028537}
- component: {fileID: 4685976020761657151}
m_Layer: 0
m_Name: Collider (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6749958264563028537
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5690882831837796157}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.57, y: -14.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5332178590545132912}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &4685976020761657151
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5537882261351490957}
m_GameObject: {fileID: 5690882831837796157}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ce0afadfd77b3b40bf16a06353f4b73, type: 3}
m_Name:
m_EditorClassIdentifier:
m_type: 3
m_effect: {fileID: 0}
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.47998953, y: 6.067669}
- {x: -1.6588964, y: 7.163183}
- {x: -2.0669496, y: 4.83502}
- {x: -2.8456762, y: 4.7196417}
- {x: -2.705472, y: -1.641943}
- {x: -1.8197842, y: -2.109373}
- {x: -1.0960312, y: -2.2521267}
- {x: -0.7481475, y: -1.7787323}
--- !u!1 &5775282116005255371
GameObject:
m_ObjectHideFlags: 0
......@@ -11242,68 +11143,6 @@ Transform:
m_Father: {fileID: 2419814893835863036}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6064480929474927418
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4977579475787362784}
- component: {fileID: 3587427411694298417}
m_Layer: 0
m_Name: Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4977579475787362784
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064480929474927418}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.57, y: -6.72, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2228437097257834197}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &3587427411694298417
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064480929474927418}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 5.794328, y: 4.579209}
- {x: 3.2366152, y: 5.208303}
- {x: -1.3666914, y: 0.28980398}
- {x: -1.624429, y: -0.793725}
- {x: -1.2389681, y: -1.4142365}
- {x: 0.13899231, y: -1.1761737}
--- !u!1 &6079020160306596385
GameObject:
m_ObjectHideFlags: 0
......@@ -11321,7 +11160,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &7121524795785158589
Transform:
m_ObjectHideFlags: 0
......@@ -16243,6 +16082,69 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6431039906173124888
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 302264519491199943}
- component: {fileID: 307451026146385861}
m_Layer: 0
m_Name: Collider (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &302264519491199943
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6431039906173124888}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.37, y: -6.72, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5332178590545132912}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &307451026146385861
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6431039906173124888}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -4.129364, y: 4.940155}
- {x: -7.183381, y: 4.590682}
- {x: -2.6441774, y: 0.09060097}
- {x: -1.3001957, y: -1.1968307}
- {x: 0.06904459, y: -1.457089}
- {x: 0.39629102, y: -1.0020208}
- {x: 0.56449056, y: 0.19253302}
--- !u!1 &6524767557548069935
GameObject:
m_ObjectHideFlags: 0
......@@ -21415,7 +21317,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1567781549190624595
Transform:
m_ObjectHideFlags: 0
......@@ -22309,6 +22211,43 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!1 &8516320814822635321
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5332178590545132912}
m_Layer: 0
m_Name: 2DColliderGP
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5332178590545132912
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8516320814822635321}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.64, z: 0.32}
m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.099999994}
m_Children:
- {fileID: 6310447531794864167}
- {fileID: 302264519491199943}
- {fileID: 1302569291776586926}
- {fileID: 6749958264563028537}
- {fileID: 8675982677168821939}
- {fileID: 1126455323151030519}
- {fileID: 7081090464631473846}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8629136269542849139
GameObject:
m_ObjectHideFlags: 0
......@@ -22427,6 +22366,70 @@ Transform:
m_Father: {fileID: 2419814894542974148}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8673713255030080476
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7081090464631473846}
- component: {fileID: 2837117230879110274}
m_Layer: 0
m_Name: Collider (6)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7081090464631473846
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8673713255030080476}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.9, y: 0, z: 0}
m_LocalScale: {x: 10, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5332178590545132912}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &2837117230879110274
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8673713255030080476}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 1.7715682, y: 2.797348}
- {x: 1.4904402, y: 4.1782265}
- {x: -3.3168702, y: 4.197733}
- {x: -3.7477307, y: 2.782299}
- {x: -1.4640676, y: 2.3778286}
- {x: -0.4812889, y: 2.2421455}
- {x: 0.3952198, y: 2.3396091}
- {x: 1.3644868, y: 2.5013695}
--- !u!1 &8762523892591006847
GameObject:
m_ObjectHideFlags: 0
......@@ -23333,7 +23336,7 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: 6f80a585426cf8749b2ed31e61717f4e,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1197654348229058851, guid: 6f80a585426cf8749b2ed31e61717f4e,
type: 3}
......@@ -23387,15 +23390,15 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6f80a585426cf8749b2ed31e61717f4e, type: 3}
--- !u!4 &4006977738987523775 stripped
--- !u!4 &2374044451189214183 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 6f80a585426cf8749b2ed31e61717f4e,
m_CorrespondingSourceObject: {fileID: 5914173064080830018, guid: 6f80a585426cf8749b2ed31e61717f4e,
type: 3}
m_PrefabInstance: {fileID: 8277917143235192229}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2374044451189214183 stripped
--- !u!4 &4006977738987523775 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5914173064080830018, guid: 6f80a585426cf8749b2ed31e61717f4e,
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 6f80a585426cf8749b2ed31e61717f4e,
type: 3}
m_PrefabInstance: {fileID: 8277917143235192229}
m_PrefabAsset: {fileID: 0}
3D Fruit/Assets/Water2D/Core/MetaballParticleClass.cs
View file @ f0fc7aed
......@@ -19,8 +19,11 @@ public class MetaballParticleClass : MonoBehaviour
{
_active = value;
if (MObject)
{
//if(value)
{
MObject.SetActive(value);
}
if (tr)
tr.Clear();
......@@ -174,8 +177,11 @@ public class MetaballParticleClass : MonoBehaviour
if (delta > LifeTime)
{
delta *= 0;
if(BattleCtrl.instance.battleUI.bMainToSelect && BattleCtrl.instance.battleUI.bfadeState)
{
Active = false;
}
}
else
{
delta += Time.deltaTime;
......
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