Skip to content

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

代码提交

parent 37647745
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 294220 additions and 154229 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ 322067c6
This diff is collapsed.
3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 322067c6
......@@ -77,6 +77,8 @@ public class BattleUI : MonoBehaviour
public GameObject m_waterCameraObj;
public Sprite m_goodSprite;
public Sprite m_excellentSprite;
public Button m_refreshBtn;//刷新按钮
public DecorateUI m_decorateUI;
public Action onStartBtn;
public Action onPosUpBtn;
public Action onPosDownBtn;
......@@ -134,6 +136,7 @@ public class BattleUI : MonoBehaviour
m_startBtn.onClick.AddListener(StartBtn);
m_settingBtn.onClick.AddListener(SettingBtn);
m_okBtn.onClick.AddListener(OkBtn);
m_refreshBtn.onClick.AddListener(RefreshBtn);
//m_posUpBtn.onClick.AddListener(PosUpBtn);
//m_posDownBtn.onClick.AddListener(PosDownBtn);
//m_fieldFarBtn.onClick.AddListener(FieldFarBtn);
......@@ -214,7 +217,23 @@ public class BattleUI : MonoBehaviour
void OkBtn()
{
SetOkBtnState(false);
ChangeMainToSelectScene();
SetRefreshBtnState(false);
//ChangeMainToSelectScene();
m_sq = DOTween.Sequence();
m_sq.Append(Camera.main.transform.DOLocalMoveY(-2.27f, 2.0f));
m_sq.Join(m_waterCameraObj.transform.DOLocalMoveY(-6.7f, 2.0f));
m_sq.AppendCallback(delegate ()
{
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
BattleCtrl.instance.levelManager.curLevel.fruitView.StartMoveWater();
}
});
}
//refresh按钮状态
public void SetRefreshBtnState(bool value)
{
m_refreshBtn.gameObject.SetActive(value);
}
//ok按钮状态
public void SetOkBtnState(bool value)
......@@ -536,9 +555,10 @@ public class BattleUI : MonoBehaviour
}
}
//刷新
public void RefreshBtn()
void RefreshBtn()
{
GlobalConfig.Refresh();
//GlobalConfig.Refresh();
BattleCtrl.instance.levelManager.curLevel.fruitView.Refresh();
}
//设置炸弹
public void SetBomb()
......@@ -873,7 +893,8 @@ public class BattleUI : MonoBehaviour
m_loseObj.SetActive(false);
//水果刚体状态重置
GlobalConfig.SetFruitRigidState(false);
//BattleCtrl.instance.levelManager.curLevel.fruitView.DelayClearWaterEffect();
//水流体重置
BattleCtrl.instance.levelManager.curLevel.fruitView.ClearWaterEffect();
}
}
else
......@@ -892,6 +913,11 @@ public class BattleUI : MonoBehaviour
ss.a = m_fadeAlpha;
m_fadeMaskImage.color = ss;
}
//设置流水相机状态
public void SetWaterCameraState(bool value)
{
m_waterCameraObj.SetActive(value);
}
//设置icon数量
public void SetNeedIconNum(int num)
{
......@@ -914,6 +940,11 @@ public class BattleUI : MonoBehaviour
m_needIconSymbol.SetActive(value);
}
}
//显示装饰界面
public void ShowDecorateUI()
{
m_decorateUI.gameObject.SetActive(true);
}
private void OnDestroy()
{
for (int i = 0; i < m_objList.Count; i++)
......
3D Fruit/Assets/#A2_Scripts/Battle/UI/DecorateUI.cs 0 → 100644
View file @ 322067c6
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using System;
public class DecorateUI : MonoBehaviour
{
public Image m_progressImage;
public Button m_button1;
public Button m_button2;
public Button m_button3;
private float m_curProgress = 0.0f;
private bool m_bStart = false;
private bool m_bMax = false;
public Action<float> m_StopAction;
public Action<float> m_StartAction;
// Start is called before the first frame update
void Awake()
{
m_button1.onClick.AddListener(OnButton1);
m_button2.onClick.AddListener(OnButton2);
m_button3.onClick.AddListener(OnButton3);
}
void OnButton1()
{
HideAllButton();
}
void OnButton2()
{
HideAllButton();
}
void OnButton3()
{
HideAllButton();
}
void HideAllButton()
{
m_bStart = true;
m_button1.gameObject.SetActive(false);
m_button2.gameObject.SetActive(false);
m_button3.gameObject.SetActive(false);
}
// Update is called once per frame
void Update()
{
if (m_curProgress > 0.0f && Input.GetMouseButtonUp(0))
{
m_bStart = false;
m_StopAction?.Invoke(m_curProgress);
}
if (m_bStart)
{
if (m_bMax)
{
m_curProgress -= Time.deltaTime;
if (m_curProgress <= 0.0f)
{
m_bMax = false;
}
}
else
{
m_curProgress += Time.deltaTime;
if(m_curProgress >= 1.0f)
{
m_bMax = true;
}
}
m_progressImage.fillAmount = m_curProgress;
m_StartAction?.Invoke(m_curProgress);
}
}
}
3D Fruit/Assets/#A2_Scripts/Battle/UI/DecorateUI.cs.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: f929b551fa2a91d418feb7d6df1956e2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A2_Scripts/Battle/View/Collider2DView.cs 0 → 100644
View file @ 322067c6
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
public class Collider2DView : MonoBehaviour
{
public GameObject m_bottomObj;
public GameObject m_openObj;
// Start is called before the first frame update
void Start()
{
}
//开始移动
public void StartMove()
{
m_bottomObj.SetActive(false);
m_openObj.SetActive(true);
//transform.DOLocalMoveY(10.0f, 3.0f).onComplete = delegate ()
//{
//};
}
}
3D Fruit/Assets/#A2_Scripts/Battle/View/Collider2DView.cs.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 8209e956ad295cc4a86189fe7634f164
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitItemFragView.cs 0 → 100644
View file @ 322067c6
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using System;
public class FruitItemFragView : MonoBehaviour
{
private MeshRenderer m_meshRender;
private GameObject m_childObj;
private MeshRenderer[] m_fragTrans;//碎块
private List<Vector3> m_fragPos = new List<Vector3>();//碎块初始位置
private List<Quaternion> m_fragQua = new List<Quaternion>();//碎块初始旋转
private bool m_bControl = true;
public Action m_finishAction;
public Action m_finishCollider;
private void Awake()
{
m_meshRender = GetComponent<MeshRenderer>();
if (transform.childCount > 0)
{
Transform varTransChild = transform.GetChild(0);
if (varTransChild)
{
m_childObj = varTransChild.gameObject;
if (m_childObj)
{
m_fragTrans = m_childObj.GetComponentsInChildren<MeshRenderer>();
for (int i = 0; i < m_fragTrans.Length; i++)
{
Transform varTrans = m_fragTrans[i].transform;
m_fragPos.Add(varTrans.localPosition);
m_fragQua.Add(varTrans.localRotation);
}
}
}
}
}
private void OnCollisionEnter(Collision other)
{
if(string.Equals(other.gameObject.name,"Cut") && m_bControl)
{
m_bControl = false;
m_finishCollider?.Invoke();
if (m_meshRender)
{
m_meshRender.enabled = false;
}
if (m_childObj)
{
m_childObj.transform.localScale = Vector3.one;
m_childObj.SetActive(true);
//m_childObj.transform.DOScale(Vector3.zero, 1.5f);
m_childObj.transform.DOScale(Vector3.zero, 1.0f).onComplete = delegate ()
{
m_finishAction?.Invoke();
};
}
}
}
//重置碎块状态
public void ResetFragState()
{
m_bControl = true;
if (m_meshRender)
{
m_meshRender.enabled = true;
}
if (m_childObj)
{
m_childObj.SetActive(false);
}
if (m_fragTrans != null)
{
for (int i = 0; i < m_fragTrans.Length; i++)
{
m_fragTrans[i].transform.localPosition = m_fragPos[i];
m_fragTrans[i].transform.localRotation = m_fragQua[i];
}
}
}
}
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitItemFragView.cs.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 1278d9d5a261bfb42807b7ab5cfc82cb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitItemView.cs
View file @ 322067c6
......@@ -15,6 +15,7 @@ public class FruitItemView : MonoBehaviour
private MeshRenderer m_meshRender;
private GameObject m_childObj;
private MeshRenderer[] m_fragTrans;//碎块
private FruitItemFragView[] m_fragView;
private List<Vector3> m_fragPos = new List<Vector3>();//碎块初始位置
private List<Quaternion> m_fragQua = new List<Quaternion>();//碎块初始旋转
private LiquidContainer m_liquidContainer;//流体特效容器
......@@ -24,6 +25,10 @@ public class FruitItemView : MonoBehaviour
private Vector3 m_liquidStartPos;
private Quaternion m_liquidStartQua;
private Vector3 m_liquidStartScale;
private int m_fragIndex;
private int m_fragLayer = 14;
private int m_startLayer = 1;
private bool m_bControlCollider = true;
private void Awake()
{
......@@ -31,7 +36,7 @@ public class FruitItemView : MonoBehaviour
m_meshRender = GetComponent<MeshRenderer>();
//m_meshRender.sortingLayerID = 1;
//m_meshRender.sortingOrder = 1;
if(transform.childCount > 0)
if (transform.childCount > 0)
{
Transform varTransChild = transform.GetChild(0);
if (varTransChild)
......@@ -46,6 +51,12 @@ public class FruitItemView : MonoBehaviour
m_fragPos.Add(varTrans.localPosition);
m_fragQua.Add(varTrans.localRotation);
}
m_fragView = m_childObj.GetComponentsInChildren<FruitItemFragView>();
for(int i = 0;i< m_fragView.Length;i++)
{
m_fragView[i].m_finishAction += OnFinish;
m_fragView[i].m_finishCollider += OnFinishCollider;
}
}
}
}
......@@ -125,6 +136,7 @@ public class FruitItemView : MonoBehaviour
{
m_childObj.SetActive(true);
}
gameObject.layer = m_fragLayer;
//显示特效
if (m_effect)
{
......@@ -152,9 +164,48 @@ public class FruitItemView : MonoBehaviour
//m_effect.Spawn();
}
}
//完成小碎块
void OnFinish()
{
m_fragIndex++;
if(m_fragIndex >= 3)
{
ReBack();
m_fragIndex = 0;
}
Invoke("DelayReset", 2.0f);
}
//完成碰撞
void OnFinishCollider()
{
if(m_bControlCollider)
{
m_bControlCollider = false;
BattleCtrl.instance.levelManager.curLevel.fruitView.WaterFruit(this);
}
}
private void ReBack()
{
PoolManager.Instance.ReturnObjectToPool(gameObject);
for (int i = 0; i < m_fragView.Length; i++)
{
m_fragView[i].ResetFragState();
}
ResetFragState();
}
//3秒后还原状态
void DelayReset()
{
if(gameObject.layer == m_fragLayer)
{
ReBack();
}
}
//重置碎块状态
public void ResetFragState()
{
m_bControlCollider = true;
m_fragIndex = 0;
if (m_meshRender)
{
m_meshRender.enabled = true;
......@@ -163,7 +214,8 @@ public class FruitItemView : MonoBehaviour
{
m_childObj.SetActive(false);
}
if(m_fragTrans != null)
gameObject.layer = m_startLayer;
if (m_fragTrans != null)
{
for (int i = 0; i < m_fragTrans.Length; i++)
{
......@@ -176,4 +228,16 @@ public class FruitItemView : MonoBehaviour
// m_effect.SetActive(false);
//}
}
private void OnDestroy()
{
if(m_fragView != null)
{
for (int i = 0; i < m_fragView.Length; i++)
{
m_fragView[i].m_finishAction -= OnFinish;
m_fragView[i].m_finishCollider -= OnFinishCollider;
}
}
}
}
3D Fruit/Assets/#A2_Scripts/Battle/View/GlassView.cs
View file @ 322067c6
......@@ -60,10 +60,15 @@ public class GlassView : MonoBehaviour
if (m_sportNum >= GlobalConfig.ProgressFruitNumNeed)
{
m_sportNum = GlobalConfig.ProgressFruitNumNeed;
BattleCtrl.instance.levelManager.curLevel.CalculateStar();
//BattleCtrl.instance.levelManager.curLevel.CalculateStar();
BattleCtrl.instance.OnBattleWin();
}
}
//草莓数量
public void SetOnlyStrawberryNum(int num)
{
m_strawberryNum = num;
}
//水果数量
public void SetFruitNum(int num1,int num2,int num3)
{
......@@ -75,24 +80,24 @@ public class GlassView : MonoBehaviour
//BattleCtrl.instance.levelManager.curLevel.CalculateStar();
//BattleCtrl.instance.OnBattleWin();
}
m_strawberryNum += num1;
if (m_strawberryNum >= GlobalConfig.ProgressFruitNumNeed)
{
m_strawberryNum = GlobalConfig.ProgressFruitNumNeed;
//BattleCtrl.instance.battleUI.SetStrawberryState(true);
}
m_lemonNum += num2;
if (m_lemonNum >= GlobalConfig.ProgressFruitNumNeed)
{
m_lemonNum = GlobalConfig.ProgressFruitNumNeed;
//BattleCtrl.instance.battleUI.SetLemonState(true);
}
m_orangeNum += num3;
if (m_orangeNum >= GlobalConfig.ProgressFruitNumNeed)
{
m_orangeNum = GlobalConfig.ProgressFruitNumNeed;
//BattleCtrl.instance.battleUI.SetOrangeState(true);
}
//m_strawberryNum += num1;
//if (m_strawberryNum >= GlobalConfig.ProgressFruitNumNeed)
//{
// m_strawberryNum = GlobalConfig.ProgressFruitNumNeed;
// //BattleCtrl.instance.battleUI.SetStrawberryState(true);
//}
//m_lemonNum += num2;
//if (m_lemonNum >= GlobalConfig.ProgressFruitNumNeed)
//{
// m_lemonNum = GlobalConfig.ProgressFruitNumNeed;
// //BattleCtrl.instance.battleUI.SetLemonState(true);
//}
//m_orangeNum += num3;
//if (m_orangeNum >= GlobalConfig.ProgressFruitNumNeed)
//{
// m_orangeNum = GlobalConfig.ProgressFruitNumNeed;
// //BattleCtrl.instance.battleUI.SetOrangeState(true);
//}
//BattleCtrl.instance.battleUI.SetStrawberryNum((int)m_strawberryNum);
//BattleCtrl.instance.battleUI.SetLemonNum((int)m_lemonNum);
//BattleCtrl.instance.battleUI.SetOrangeNum((int)m_orangeNum);
......@@ -147,7 +152,7 @@ public class GlassView : MonoBehaviour
m_strawberryOffest += Time.deltaTime * m_speed;
Vector3 varSize = m_strawberry.localScale;
varSize.y = m_strawberryOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
varSize.y = m_strawberryOffest / (float)GlobalConfig.ProgressFruitNumNeed;
m_strawberry.localScale = varSize;
//草莓位置
......@@ -180,81 +185,80 @@ public class GlassView : MonoBehaviour
//}
//m_maskTrans.localScale = varSize;
}
if (m_lemonOffest < m_lemonNum)
{
m_lemon.gameObject.SetActive(true);
m_lemonOffest += Time.deltaTime * m_speed;
//if (m_lemonOffest < m_lemonNum)
//{
// m_lemon.gameObject.SetActive(true);
// m_lemonOffest += Time.deltaTime * m_speed;
Vector3 varSize = m_lemon.localScale;
varSize.y = m_lemonOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
m_lemon.localScale = varSize;
// Vector3 varSize = m_lemon.localScale;
// varSize.y = m_lemonOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
// m_lemon.localScale = varSize;
Vector3 varPos = m_lemon.localPosition;
varPos.y = m_startPos + m_strawberry.localScale.y * m_power;
m_lemon.localPosition = varPos;
// Vector3 varPos = m_lemon.localPosition;
// varPos.y = m_startPos + m_strawberry.localScale.y * m_power;
// m_lemon.localPosition = varPos;
if (m_orange)
{
Vector3 varOrangePos = m_orange.localPosition;
varOrangePos.y = m_startPos + m_strawberry.localScale.y * m_power
+ m_lemon.localScale.y * m_power;
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;
}
if (m_orangeOffest < m_orangeNum && m_orange)
{
m_orange.gameObject.SetActive(true);
m_orangeOffest += Time.deltaTime * m_speed;
// if (m_orange)
// {
// Vector3 varOrangePos = m_orange.localPosition;
// varOrangePos.y = m_startPos + m_strawberry.localScale.y * m_power
// + m_lemon.localScale.y * m_power;
// 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;
//}
//if (m_orangeOffest < m_orangeNum && m_orange)
//{
// m_orange.gameObject.SetActive(true);
// m_orangeOffest += Time.deltaTime * m_speed;
Vector3 varSize = m_orange.localScale;
varSize.y = m_orangeOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
m_orange.localScale = varSize;
// Vector3 varSize = m_orange.localScale;
// varSize.y = m_orangeOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
// m_orange.localScale = varSize;
Vector3 varPos = m_orange.localPosition;
varPos.y = m_startPos + m_strawberry.localScale.y * m_power
+ m_lemon.localScale.y * m_power;
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;
}
// Vector3 varPos = m_orange.localPosition;
// varPos.y = m_startPos + m_strawberry.localScale.y * m_power
// + m_lemon.localScale.y * m_power;
// 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;
//}
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
//if(m_strawberryOffest >= m_strawberryNum && m_lemonOffest >= m_lemonNum)
//{
// m_fruitView.HideAnimator();
//}
if ((m_strawberryOffest+ m_lemonOffest + m_orangeOffest) >= 10.0f
&& m_bControl)
{
m_bControl = false;
BattleCtrl.instance.levelManager.curLevel.CalculateStar();
BattleCtrl.instance.OnBattleWin();
}
if((m_strawberryOffest + m_lemonOffest + m_orangeOffest) >= 12.0f
&& m_bTop)
{
m_bTop = false;
BattleCtrl.instance.OnFirstLevelTop();
}
//if (m_strawberryOffest >= GlobalConfig.ProgressFruitNumNeed && m_bControl)
//if ((m_strawberryOffest+ m_lemonOffest + m_orangeOffest) >= 10.0f
// && m_bControl)
//{
// m_bControl = false;
// BattleCtrl.instance.levelManager.curLevel.CalculateStar();
// //BattleCtrl.instance.levelManager.curLevel.CalculateStar();
// BattleCtrl.instance.OnBattleWin();
//}
//if((m_strawberryOffest + m_lemonOffest + m_orangeOffest) >= 12.0f
// && m_bTop)
//{
// m_bTop = false;
// BattleCtrl.instance.OnFirstLevelTop();
//}
if (m_strawberryNum > 0 && m_strawberryOffest >= m_strawberryNum && m_bControl)
{
m_bControl = false;
BattleCtrl.instance.battleUI.SetWaterCameraState(false);
}
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
......
3D Fruit/Assets/#A2_Scripts/Pool/CacheManager.cs
View file @ 322067c6
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Water2D;
public class CacheManager : MonoBehaviour
{
......@@ -55,59 +56,11 @@ public class CacheManager : MonoBehaviour
[SerializeField]
private GameObject m_cmobo3EffectObj;//cmobo3
[SerializeField]
private GameObject m_waterStarwberry1_1Obj;//水插件草莓1
private Transform m_waterStarwberryParentObj;//水插件草莓
[SerializeField]
private GameObject m_waterStarwberry1_2Obj;
private Transform m_waterLemonParentObj;//水插件柠檬
[SerializeField]
private GameObject m_waterStarwberry1_3Obj;
[SerializeField]
private GameObject m_waterStarwberry1_4Obj;
[SerializeField]
private GameObject m_waterStarwberry1_5Obj;
[SerializeField]
private GameObject m_waterStarwberry1_6Obj;
[SerializeField]
private GameObject m_waterStarwberry1_7Obj;
[SerializeField]
private GameObject m_waterStarwberry1_8Obj;
[SerializeField]
private GameObject m_waterStarwberry1_9Obj;
[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_waterLemon1_6Obj;
[SerializeField]
private GameObject m_waterLemon1_7Obj;
[SerializeField]
private GameObject m_waterLemon1_8Obj;
[SerializeField]
private GameObject m_waterLemon1_9Obj;
[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_waterOrange1_6Obj;
[SerializeField]
private GameObject m_waterOrange1_7Obj;
[SerializeField]
private GameObject m_waterOrange1_8Obj;
[SerializeField]
private GameObject m_waterOrange1_9Obj;
private Transform m_waterOrangeParentObj;//水插件橙子
public GameObject lineObj => m_lineObj;
public GameObject LemonObj => m_LemonObj;
public GameObject OrangeObj => m_OrangeObj;
......@@ -133,36 +86,15 @@ public class CacheManager : MonoBehaviour
public GameObject cmobo1EffectObj => m_cmobo1EffectObj;
public GameObject cmobo2EffectObj => m_cmobo2EffectObj;
public GameObject cmobo3EffectObj => m_cmobo3EffectObj;
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 waterStarwberry1_6Obj => m_waterStarwberry1_6Obj;
public GameObject waterStarwberry1_7Obj => m_waterStarwberry1_7Obj;
public GameObject waterStarwberry1_8Obj => m_waterStarwberry1_8Obj;
public GameObject waterStarwberry1_9Obj => m_waterStarwberry1_9Obj;
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 waterLemon1_6Obj => m_waterLemon1_6Obj;
public GameObject waterLemon1_7Obj => m_waterLemon1_7Obj;
public GameObject waterLemon1_8Obj => m_waterLemon1_8Obj;
public GameObject waterLemon1_9Obj => m_waterLemon1_9Obj;
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 waterOrange1_6Obj => m_waterOrange1_6Obj;
public GameObject waterOrange1_7Obj => m_waterOrange1_7Obj;
public GameObject waterOrange1_8Obj => m_waterOrange1_8Obj;
public GameObject waterOrange1_9Obj => m_waterOrange1_9Obj;
public static CacheManager Instance = null;
private Water2D_Spawner[] m_strawberryArrayObj;
private Water2D_Spawner[] m_orangeArrayObj;
public Water2D_Spawner[] strawberryArrayObj => m_strawberryArrayObj;
public Water2D_Spawner[] orangeArrayObj => m_orangeArrayObj;
void Awake()
{
Instance = this;
m_strawberryArrayObj = m_waterStarwberryParentObj.GetComponentsInChildren<Water2D_Spawner>();
m_orangeArrayObj = m_waterOrangeParentObj.GetComponentsInChildren<Water2D_Spawner>();
}
}
3D Fruit/Assets/#A2_Scripts/Pool/Pool.cs
View file @ 322067c6
......@@ -5,7 +5,7 @@ using System.Collections.Generic;
class Pool
{
private Stack<GameObject> m_objStack = new Stack<GameObject>();
private Queue<GameObject> m_objStack = new Queue<GameObject>();
private List<GameObject> m_objList = new List<GameObject>();
//the root obj for unused obj
......@@ -43,7 +43,7 @@ class Pool
GameObject varGo = null;
if (m_objStack.Count > 0)
{
varGo = m_objStack.Pop();
varGo = m_objStack.Dequeue();
}
else
{
......@@ -61,7 +61,7 @@ class Pool
{
if (go)
{
m_objStack.Push(go);
m_objStack.Enqueue(go);
go.SetActive(false);
}
}
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 322067c6
This diff is collapsed.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_1_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_1_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: eccb6e3e8ff2da24e88ea79968526e73
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_2_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_2_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 6d2d88006cdbc8e4d81dd27020a48af6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_3_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_3_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: a5fe297154619b547bb3fd2478e3c37c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_4_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Orange_sh_4_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: ffe892353e3335e4cb205f5ed0904b2c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_1_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_1_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 9180de49401aaa34d8789e3ddf35f736
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_2_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_2_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 84b3f5e2b6efdd045aa6a064ee7f9bea
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_3_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_3_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 06979b94b098ded40acf521782a6366d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_4_frags.asset 0 → 100644
View file @ 322067c6
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_4_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 1fe8131cb6ebc994d9a5f8e610040a02
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/FruitFrags/Strawberry_sh_5_frags.asset.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 10eb35bb7ee407949ba8db03786422f2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A3_Prefabs/RenderTexture/PlayerCamera.prefab
View file @ 322067c6
......@@ -10,7 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 854254245170120642}
- component: {fileID: 6606692755563535586}
- component: {fileID: 8059488831629694538}
- component: {fileID: 6279930617995482042}
m_Layer: 8
m_Name: PlayerCamera
......@@ -78,14 +77,6 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &8059488831629694538
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 93651439415487147}
m_Enabled: 1
--- !u!114 &6279930617995482042
MonoBehaviour:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/#C3_Materials/BlockHole.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 6fbfb8bde71f3b74f8085a00f458b333
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/BlockHole/BlackHole 1.mat 0 → 100644
View file @ 322067c6
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlackHole 1
m_Shader: {fileID: 4800000, guid: 240c428d2423ff244b5d3113b9b1ac59, type: 3}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 1637115fc167e924ba98b2c2b1e4e683, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BottomY: -0.55
- _BumpScale: 1
- _Control: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _LeftX: -0.5
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _RightX: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _TopY: 0.55
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _BlackHolePos: {r: 0.5, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
3D Fruit/Assets/#C3_Materials/BlockHole/BlackHole 1.mat.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 85d22662eae6f3f4e926057990896959
timeCreated: 1504196491
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/BlockHole/BornFromY 1.mat 0 → 100644
View file @ 322067c6
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BornFromY 1
m_Shader: {fileID: 4800000, guid: 09b8b4872f619e34b949850005b78398, type: 3}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 1637115fc167e924ba98b2c2b1e4e683, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BornY: 0.55
- _BottomY: -0.55
- _BumpScale: 1
- _Control: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _TopY: 0.55
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
3D Fruit/Assets/#C3_Materials/BlockHole/BornFromY 1.mat.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: d4ab032b88c38254ca27dc7fd233a2d9
timeCreated: 1504194187
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/BlockHole/Squash 1.mat 0 → 100644
View file @ 322067c6
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Squash 1
m_Shader: {fileID: 4800000, guid: 2ec8883e809e2ef468843614c1017eda, type: 3}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 1637115fc167e924ba98b2c2b1e4e683, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BottomY: -0.5
- _BumpScale: 1
- _Control: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _TopY: 0.5
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
3D Fruit/Assets/#C3_Materials/BlockHole/Squash 1.mat.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 47996010d2fc6b64894ac76df352bd13
timeCreated: 1504195703
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/BlockHole/Texture.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: bd835d16914686643bf3d7cdae86ca0b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/BlockHole/Texture/Number_Blocks_01_Image.png.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 1637115fc167e924ba98b2c2b1e4e683
timeCreated: 1507969839
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/glass.mat
View file @ 322067c6
......@@ -9,7 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: glass
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _ALPHAPREMULTIPLY_ON _EMISSION _GLOSSYREFLECTIONS_OFF
_SPECULARHIGHLIGHTS_OFF
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
......
3D Fruit/Assets/#D2_Shaders/BlackHole.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 6801de16283e2b443a454c0858051107
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#D2_Shaders/BlackHole/BlackHole.shader 0 → 100644
View file @ 322067c6
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "Kaima/Other/BlackHole"
{
Properties
{
_MainTex ("Texture", 2D) = "white" {}
_RightX("Right X", Float) = 0
_LeftX("Left X", Float) = 0
_Control("Born Control", Range(0, 2)) = 0
_BlackHolePos("Black Hole Position", Vector) = (1,1,1,1)
}
SubShader
{
Tags { "RenderType"="Opaque" }
Pass
{
Cull Off
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#include "UnityCG.cginc"
struct appdata
{
float4 vertex : POSITION;
float2 uv : TEXCOORD0;
};
struct v2f
{
float2 uv : TEXCOORD0;
float4 vertex : SV_POSITION;
float3 worldPos : TEXCOORD1;
};
sampler2D _MainTex;
float4 _MainTex_ST;
float _RightX;
float _LeftX;
float _Control;
float4 _BlackHolePos;
float GetNormalizedDist(float worldPosX)
{
float range = _RightX - _LeftX;
float border = _RightX;
float dist = abs(worldPosX - border);
float normalizedDist = saturate(dist / range);
return normalizedDist;
}
v2f vert (appdata v)
{
v2f o;
o.uv = TRANSFORM_TEX(v.uv, _MainTex);
float3 worldPos = mul(unity_ObjectToWorld, v.vertex).xyz;
float3 toBlackHole = mul(unity_WorldToObject, (_BlackHolePos - worldPos)).xyz;
float normalizedDist = GetNormalizedDist(worldPos.x);
float val = max(0, _Control - normalizedDist);
v.vertex.xyz += toBlackHole * val;
o.worldPos = mul(unity_ObjectToWorld, v.vertex).xyz;
o.vertex = UnityObjectToClipPos(v.vertex);
return o;
}
fixed4 frag (v2f i) : SV_Target
{
clip(_BlackHolePos.x - i.worldPos.x);
fixed4 col = tex2D(_MainTex, i.uv);
return col;
}
ENDCG
}
}
}
3D Fruit/Assets/#D2_Shaders/BlackHole/BlackHole.shader.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 240c428d2423ff244b5d3113b9b1ac59
timeCreated: 1504196433
licenseType: Pro
ShaderImporter:
defaultTextures: []
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#D2_Shaders/BlackHole/BornFromY.shader 0 → 100644
View file @ 322067c6
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "Kaima/Other/BornFromY"
{
Properties
{
_MainTex ("Texture", 2D) = "white" {}
_TopY("Top Y", Float) = 0
_BottomY("Bottom Y", Float) = 0
_Control("Born Control", Range(0, 2)) = 0
}
SubShader
{
Tags { "RenderType"="Opaque" }
Pass
{
Cull Off
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#include "UnityCG.cginc"
struct appdata
{
float4 vertex : POSITION;
float2 uv : TEXCOORD0;
};
struct v2f
{
float2 uv : TEXCOORD0;
float4 vertex : SV_POSITION;
float3 worldPos : TEXCOORD1;
};
sampler2D _MainTex;
float4 _MainTex_ST;
float _TopY;
float _BottomY;
float _Control;
float GetNormalizedDist(float worldPosY)
{
float range = _TopY - _BottomY;
float border = _TopY;
float dist = abs(worldPosY - border);
float normalizedDist = saturate(dist / range);
return normalizedDist;
}
v2f vert (appdata v)
{
v2f o;
o.uv = TRANSFORM_TEX(v.uv, _MainTex);
float3 worldPos = mul(unity_ObjectToWorld, v.vertex).xyz;
float3 localPositiveY = mul(unity_WorldToObject, float4(0, 1, 0, 1)).xyz;
float normalizedDist = GetNormalizedDist(worldPos.y);
float val = max(0, _Control - normalizedDist);
v.vertex.xyz += localPositiveY * val;
o.worldPos = mul(unity_ObjectToWorld, v.vertex).xyz;
o.vertex = UnityObjectToClipPos(v.vertex);
return o;
}
fixed4 frag (v2f i) : SV_Target
{
clip(_TopY - i.worldPos.y);
fixed4 col = tex2D(_MainTex, i.uv);
return col;
}
ENDCG
}
}
}
3D Fruit/Assets/#D2_Shaders/BlackHole/BornFromY.shader.meta 0 → 100644
View file @ 322067c6
fileFormatVersion: 2
guid: 09b8b4872f619e34b949850005b78398
timeCreated: 1504194148
licenseType: Pro
ShaderImporter:
defaultTextures: []
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#D2_Shaders/BlackHole/Squash.shader 0 → 100644
View file @ 322067c6
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "Kaima/Other/Squash"
{
Properties
{
_MainTex ("Texture", 2D) = "white" {}
_TopY("Top Y", Float) = 0 //The top Y of the GameObject in world coord
_BottomY("Bottom Y", Float) = 0
_Control("Control Squash", Range(0, 1)) = 0 //control the level of squash
}
SubShader
{
Tags { "RenderType"="Opaque" }
Pass
{
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#include "UnityCG.cginc"
struct appdata
{
float4 vertex : POSITION;
float2 uv : TEXCOORD0;
};
struct v2f
{
float2 uv : TEXCOORD0;
float4 vertex : SV_POSITION;
};
sampler2D _MainTex;
float4 _MainTex_ST;
float _TopY;
float _BottomY;
float _Control;
float GetNormalizedDist(float worldPosY)
{
float range = _TopY - _BottomY;
float border = _TopY;
float dist = abs(worldPosY - border);
float normalizedDist = saturate(dist / range);
return normalizedDist;
}
v2f vert (appdata v)
{
v2f o;
o.uv = TRANSFORM_TEX(v.uv, _MainTex);
float worldPosY = mul(unity_ObjectToWorld, v.vertex).y;
float3 localNegativeY = mul(unity_WorldToObject, float4(0, -1, 0, 1)).xyz;
float normalizedDist = GetNormalizedDist(worldPosY);
float val = max(0, _Control - normalizedDist);
v.vertex.xyz += localNegativeY * val;
o.vertex = UnityObjectToClipPos(v.vertex);
return o;
}
fixed4 frag (v2f i) : SV_Target
{
fixed4 col = tex2D(_MainTex, i.uv);
return col;
}
ENDCG
}
}
}
3D Fruit/Assets/#D2_Shaders/BlackHole/Squash.shader.meta 0 → 100644
View file @ 322067c6
This diff is collapsed.
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @ 322067c6
This diff is collapsed.
3D Fruit/Assets/Res/Levels/Level1.prefab
View file @ 322067c6
This diff is collapsed.
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @ 322067c6
This diff is collapsed.
3D Fruit/ProjectSettings/TagManager.asset
View file @ 322067c6
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