Skip to content

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

ui逻辑

parent 50bfa0a1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2352 additions and 615 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ 74afdf22
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.45130503, g: 0.5001916, b: 0.5690723, a: 1}
m_IndirectSpecularColor: {r: 0.45130473, g: 0.5001914, b: 0.5690714, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &4
LightmapSettings:
......@@ -121,37 +121,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &154321938 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1518767725, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 1759070561668051926}
m_PrefabAsset: {fileID: 0}
--- !u!114 &154321940
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154321938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 50
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &186647394
GameObject:
m_ObjectHideFlags: 0
......@@ -198,7 +167,6 @@ MonoBehaviour:
levelPrefs:
- {fileID: 8692181047053733938, guid: 90ed022fa9d48a64f910aad15b7faa2d, type: 3}
- {fileID: 8692181047053733938, guid: f7454de7619e58043bd3aad03242010a, type: 3}
- {fileID: 9081069388829900105, guid: 50002a8d201ddd64bb5b240aa652c3fa, type: 3}
--- !u!1 &543166196
GameObject:
m_ObjectHideFlags: 0
......@@ -314,86 +282,6 @@ MonoBehaviour:
battleUI: {fileID: 4123899719278745304}
m_levelManager: {fileID: 186647396}
m_light: {fileID: 1440651475}
--- !u!1 &1070447182
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1070447183}
- component: {fileID: 1070447185}
- component: {fileID: 1070447184}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1070447183
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1070447182}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1216729876}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -90, y: 20}
m_SizeDelta: {x: 100, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1070447184
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1070447182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7181ba97d7c4e604181e11a1afe4f066, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1070447185
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1070447182}
m_CullTransparentMesh: 0
--- !u!224 &1216729876 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6111148557972933165, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 1759070561668051926}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1440651475
GameObject:
m_ObjectHideFlags: 0
......@@ -583,118 +471,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 767122296, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1518767726, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchoredPosition.y
value: -219
objectReference: {fileID: 0}
- target: {fileID: 1518767726, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchoredPosition.x
value: -310
objectReference: {fileID: 0}
- target: {fileID: 1518767726, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1518767726, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2122888657, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2122888657, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2122888657, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchoredPosition.x
value: 75
objectReference: {fileID: 0}
- target: {fileID: 2122888657, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1028847026378544127, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1028847026378544127, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1028847026378544127, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 285
objectReference: {fileID: 0}
- target: {fileID: 1028847026378544127, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -85
objectReference: {fileID: 0}
- target: {fileID: 1881638514107634254, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Text
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4375240324243274625, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: bbcd5d9a51c5d054fa1ea42c7a46f01e,
type: 3}
- target: {fileID: 5033102133725279573, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033102133725279573, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033102133725279573, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 500
objectReference: {fileID: 0}
- target: {fileID: 5033102133725279573, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -80
objectReference: {fileID: 0}
- target: {fileID: 5033102133725279573, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 160
objectReference: {fileID: 0}
- target: {fileID: 5033102133725279573, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 160
objectReference: {fileID: 0}
- target: {fileID: 5181902483590371204, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 35
objectReference: {fileID: 0}
- target: {fileID: 5401940880687521620, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676328073066, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Name
......@@ -805,23 +581,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6111148557972933165, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1448
objectReference: {fileID: 0}
- target: {fileID: 6111148557972933165, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -345
objectReference: {fileID: 0}
- target: {fileID: 9047749345637030351, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 1518767727, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
--- !u!114 &4123899719278745304 stripped
MonoBehaviour:
......
3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 74afdf22
......@@ -43,6 +43,9 @@ public class BattleUI : MonoBehaviour
public GameObject m_symbolObj;//十字架图标
public GameObject m_takeBtnObj;//take按钮
public Text m_moveNumText;//移动次数
public GameObject m_strawberrySymbolObj;//草莓✔
public GameObject m_lemonSymbolObj;//柠檬✔
public GameObject m_orangeSymbolObj;//橙子✔
public LineUI m_lineUI;
public Action onStartBtn;
public Action onPosUpBtn;
......@@ -62,6 +65,7 @@ public class BattleUI : MonoBehaviour
//线的处理
private Stack<GameObject> m_objStack = new Stack<GameObject>();
private List<GameObject> m_objList = new List<GameObject>();
private List<GameObject> m_lineLst = new List<GameObject>();
public bool isDebug => m_bIsDebug;
private Color m_blueBgColor = new Color(135.0f/255.0f, 133.0f / 255.0f, 247.0f / 255.0f, 1.0f);
private Color m_greenBgColor = new Color(133.0f/255.0f, 247.0f / 255.0f, 146.0f / 255.0f, 1.0f);
......@@ -304,13 +308,16 @@ public class BattleUI : MonoBehaviour
varPos.y = -286.0f;
m_fruitSecondLineObj.SetActive(true);
}
m_fruitGroupRT.anchoredPosition = varPos;
m_moveNumText.text = string.Format("move {0:d}", GlobalConfig.FruitMoveTotalNum);
//m_fruitGroupRT.anchoredPosition = varPos;
m_moveNumText.text = string.Format("{0:d}", GlobalConfig.FruitMoveTotalNum);
SetStrawberryState(false);
SetLemonState(false);
SetOrangeState(false);
}
//设置移动次数
public void SetMoveNum(int num)
{
m_moveNumText.text = string.Format("move {0:d}", num);
m_moveNumText.text = string.Format("{0:d}", num);
}
//设置战斗UI状态
public void SetBattleObjState(bool bool_)
......@@ -475,13 +482,39 @@ public class BattleUI : MonoBehaviour
{
varLine.DrawLine(startP, finalP);
}
m_lineLst.Add(varObj);
}
//回收
public void RecycleLine()
{
for (int i = 0; i < m_objList.Count; i++)
for (int i = 0; i < m_lineLst.Count; i++)
{
ReturnObjectToPool(m_lineLst[i]);
}
m_lineLst.Clear();
}
//设置草莓状态
public void SetStrawberryState(bool value)
{
if(m_strawberrySymbolObj)
{
m_strawberrySymbolObj.SetActive(value);
}
}
//设置柠檬状态
public void SetLemonState(bool value)
{
if (m_lemonSymbolObj)
{
m_lemonSymbolObj.SetActive(value);
}
}
//设置橙子状态
public void SetOrangeState(bool value)
{
if (m_orangeSymbolObj)
{
ReturnObjectToPool(m_objList[i]);
m_orangeSymbolObj.SetActive(value);
}
}
private void OnDestroy()
......@@ -493,5 +526,7 @@ public class BattleUI : MonoBehaviour
m_objList.Clear();
m_objList = null;
m_objStack = null;
m_lineLst.Clear();
m_lineLst = null;
}
}
3D Fruit/Assets/#A2_Scripts/Battle/UI/LineUI.cs
View file @ 74afdf22
......@@ -11,12 +11,12 @@ public class LineUI : MonoBehaviour
public void DrawLine(Vector3 startP, Vector3 finalP)
{
Vector3 varStart = startP;
varStart.x = (varStart.x - Screen.width / 2f) / (Screen.height / GlobalConfig.NormalHeight);
varStart.y = (varStart.y - Screen.height / 2f) / (Screen.height / GlobalConfig.NormalHeight);
varStart.x = (varStart.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth);
varStart.y = (varStart.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth);
varStart.z = 0;
Vector3 varFinal = finalP;
varFinal.x = (varFinal.x - Screen.width / 2f) / (Screen.height / GlobalConfig.NormalHeight);
varFinal.y = (varFinal.y - Screen.height / 2f) / (Screen.height / GlobalConfig.NormalHeight);
varFinal.x = (varFinal.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth);
varFinal.y = (varFinal.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth);
varFinal.z = 0;
Vector3 rightPosition = (varStart + varFinal) / 2;
Vector3 rightRotation = varFinal - varStart;
......
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ 74afdf22
......@@ -5,6 +5,8 @@ using UnityEngine;
public class FruitView : MonoBehaviour
{
public GlassView m_glassView;
public Glass1View m_glass1View;
public Animator m_animator;
public Transform m_fruitParent;
public HighlightingEffect m_highLightEffect;
public Transform m_cutTrans;//旋转叶片
......@@ -19,6 +21,15 @@ public class FruitView : MonoBehaviour
private List<GameObject> m_fruitDropEffect = new List<GameObject>();//流体特效
private Color m_hightColor = new Color(217.0f / 255.0f, 233.0f / 255.0f, 1.0f, 1.0f);
private int m_moveNum = 0;//移动次数
private SpriteRenderer m_spriteRender;
private void Awake()
{
if (m_animator)
{
m_spriteRender = m_animator.GetComponent<SpriteRenderer>();
m_spriteRender.enabled = false;
}
}
void Start()
{
GameServices.inputService.pad.onTouchUp += OnTouchUp;
......@@ -68,6 +79,10 @@ public class FruitView : MonoBehaviour
// 抬起回调
void OnTouchUp()
{
if(m_selectLst.Count <= 0)
{
return;
}
//水果变小重置
m_bIsTouchUp = true;
m_lastSelectItem = null;
......@@ -102,11 +117,11 @@ public class FruitView : MonoBehaviour
Invoke("DelayFail", 2.5f);
}
}
if(!IsConnectRight())
{
m_selectLst.Clear();//重置下状态
return;
}
//if(!IsConnectRight())
//{
// m_selectLst.Clear();//重置下状态
// return;
//}
for (int i = 0; i < m_selectLst.Count; i++)
{
m_selectLst[i].SetFrag();
......@@ -202,29 +217,171 @@ public class FruitView : MonoBehaviour
PoolManager.Instance.ReturnObjectToPool(m_selectLst[i].gameObject);
m_selectLst[i].ResetFragState();
}
m_glassView.SetFruitNum(varStrawberryNum, varLemonNum, varOrangeNum);
if(m_glass1View)
{
m_glass1View.SetFruitNum(varStrawberryNum, varLemonNum, varOrangeNum);
}
if(m_glassView)
{
m_glassView.SetFruitNum(varStrawberryNum, varLemonNum, varOrangeNum);
}
m_selectLst.Clear();
//流体特效
if (varStrawberryNum > 0)
{
GameObject varEffect1 = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StarwberryDropEffect);
varEffect1.transform.position = m_glassView.effectPos;
m_fruitDropEffect.Add(varEffect1);
}
if(varLemonNum > 0)
m_spriteRender.enabled = true;
if(varStrawberryNum > 0)
{
GameObject varEffect2 = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.LemonDropEffect);
varEffect2.transform.position = m_glassView.effectPos;
m_fruitDropEffect.Add(varEffect2);
if(varLemonNum > 0)
{
if(varOrangeNum > 0)
{
m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate
{
if (m_animator)
{
m_animator.Play("juice_yellow");
}
});
GameServices.timerServices.Push(this, 1.0f, delegate
{
if (m_animator)
{
m_animator.Play("juice_Orange");
}
});
GameServices.timerServices.Push(this, 1.5f, delegate
{
if (m_spriteRender)
{
m_spriteRender.enabled = false;
}
});
}
else
{
m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate
{
if (m_animator)
{
m_animator.Play("juice_yellow");
}
});
GameServices.timerServices.Push(this, 1.0f, delegate
{
if (m_spriteRender)
{
m_spriteRender.enabled = false;
}
});
}
}
else
{
if (varOrangeNum > 0)
{
m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate
{
if (m_animator)
{
m_animator.Play("juice_Orange");
}
});
GameServices.timerServices.Push(this, 1.0f, delegate
{
if (m_spriteRender)
{
m_spriteRender.enabled = false;
}
});
}
else
{
m_animator.Play("juice_red");
GameServices.timerServices.Push(this, 0.5f, delegate
{
if (m_spriteRender)
{
m_spriteRender.enabled = false;
}
});
}
}
}
if (varOrangeNum > 0)
else
{
GameObject varEffect3 = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeDropEffect);
varEffect3.transform.position = m_glassView.effectPos;
m_fruitDropEffect.Add(varEffect3);
if (varLemonNum > 0)
{
if (varOrangeNum > 0)
{
m_animator.Play("juice_yellow");
GameServices.timerServices.Push(this, 0.5f, delegate
{
if (m_animator)
{
m_animator.Play("juice_Orange");
}
});
GameServices.timerServices.Push(this, 1.0f, delegate
{
if (m_spriteRender)
{
m_spriteRender.enabled = false;
}
});
}
else
{
m_animator.Play("juice_yellow");
GameServices.timerServices.Push(this, 0.5f, delegate
{
if (m_spriteRender)
{
m_spriteRender.enabled = false;
}
});
}
}
else
{
if (varOrangeNum > 0)
{
m_animator.Play("juice_Orange");
GameServices.timerServices.Push(this, 0.5f, delegate
{
if (m_spriteRender)
{
m_spriteRender.enabled = false;
}
});
}
}
}
Invoke("DelayClearDropEffect", 1.0f);
//if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex ||
// BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
//{
// if (varStrawberryNum > 0)
// {
// GameObject varEffect1 = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StarwberryDropEffect);
// varEffect1.transform.position = m_glassView.effectPos;
// m_fruitDropEffect.Add(varEffect1);
// }
// if (varLemonNum > 0)
// {
// GameObject varEffect2 = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.LemonDropEffect);
// varEffect2.transform.position = m_glassView.effectPos;
// m_fruitDropEffect.Add(varEffect2);
// }
// if (varOrangeNum > 0)
// {
// GameObject varEffect3 = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeDropEffect);
// varEffect3.transform.position = m_glassView.effectPos;
// m_fruitDropEffect.Add(varEffect3);
// }
// Invoke("DelayClearDropEffect", 1.0f);
//}
Invoke("DelayCreate", 0.2f);
}
//延迟生成
......@@ -486,7 +643,7 @@ public class FruitView : MonoBehaviour
private Vector3 curPos = Vector3.zero;
private float interval = 0.1f;
private List<Vector3> posList = new List<Vector3>();
public Material lineMaterial;
//public Material lineMaterial;
void sOnGUI()
{
Event e = Event.current;
......@@ -533,7 +690,7 @@ public class FruitView : MonoBehaviour
GL.PushMatrix();
GL.LoadOrtho();
lineMaterial.SetPass(0);
//lineMaterial.SetPass(0);
GL.Begin(GL.QUADS);
for (int i = 0; i < posList.Count - 1; i++)
{
......
3D Fruit/Assets/#A2_Scripts/Battle/View/Glass1View.cs 0 → 100644
View file @ 74afdf22
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Glass1View : MonoBehaviour
{
public MeshRenderer m_strawberryRender;//草莓
public MeshRenderer m_lemonRender;//柠檬
public MeshRenderer m_orangeRender;//橙子
public Transform m_effectPos;//特效位置
public Vector3 effectPos => m_effectPos.position;
private float m_strawberryOffest;
private float m_lemonOffest;
private float m_orangeOffest;
private float m_strawberryNum;
private float m_lemonNum;
private float m_orangeNum;
private float m_strawberryMaxNum = 3.0f;
private float m_lemonMaxNum = 3.0f;
private float m_orangeMaxNum = 3.0f;
private bool m_bControl = true;
private float m_speed = 2.0f;
private Material m_strawberry;
private Material m_lemon;
private Material m_orange;
private string m_shaderFloatStr = "_FillAmount";//shader参数
private float m_strawberryValue = 0.0f;
private float m_lemonValue = 0.0f;
private float m_orangeValue = 0.0f;
private void Awake()
{
m_strawberry = m_strawberryRender.material;
m_lemon = m_lemonRender.material;
m_orange = m_orangeRender.material;
}
//数量
public void SetFruitNum(int num1, int num2, int num3)
{
m_strawberryNum += num1;
if (m_strawberryNum > m_strawberryMaxNum)
{
m_strawberryNum = m_strawberryMaxNum;
}
m_lemonNum += num2;
if (m_lemonNum > m_lemonMaxNum)
{
m_lemonNum = m_lemonMaxNum;
}
m_orangeNum += num3;
if (m_orangeNum > m_orangeMaxNum)
{
m_orangeNum = m_orangeMaxNum;
}
}
private void Update()
{
if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle)
{
return;
}
if (m_strawberryOffest < m_strawberryNum)
{
m_strawberryOffest += Time.deltaTime * m_speed;
if(m_lemonOffest > 0)
{
if (m_orange.GetFloat(m_shaderFloatStr) > 0.4f)
{
m_orange.SetFloat(m_shaderFloatStr, m_orange.GetFloat(m_shaderFloatStr) - m_strawberryOffest / 1000);
}
}
else
{
if(m_orange.GetFloat(m_shaderFloatStr) > 0.5f)
{
m_orange.SetFloat(m_shaderFloatStr, m_orange.GetFloat(m_shaderFloatStr) - m_strawberryOffest / 1000);
}
}
if (m_lemonOffest > 0)
{
if (m_lemon.GetFloat(m_shaderFloatStr) > 0.5f)
{
m_lemon.SetFloat(m_shaderFloatStr, m_lemon.GetFloat(m_shaderFloatStr) - m_strawberryOffest / 1000);
}
}
else
{
m_lemon.SetFloat(m_shaderFloatStr, m_strawberry.GetFloat(m_shaderFloatStr) - m_lemonOffest / 10);
}
m_strawberry.SetFloat(m_shaderFloatStr, 0.9f - m_strawberryOffest/10);
}
if (m_lemonOffest < m_lemonNum)
{
m_lemonOffest += Time.deltaTime * m_speed;
if (m_strawberryOffest > 0)
{
if (m_orange.GetFloat(m_shaderFloatStr) > 0.4f)
{
m_orange.SetFloat(m_shaderFloatStr, m_orange.GetFloat(m_shaderFloatStr) - m_lemonOffest / 1000);
}
}
else
{
if (m_orange.GetFloat(m_shaderFloatStr) > 0.5f)
{
m_orange.SetFloat(m_shaderFloatStr, m_orange.GetFloat(m_shaderFloatStr) - m_lemonOffest / 1000);
}
}
if (m_strawberry.GetFloat(m_shaderFloatStr) >= 1.0f)
{
m_lemon.SetFloat(m_shaderFloatStr, 0.9f - m_lemonOffest / 10);
}
else
{
m_lemon.SetFloat(m_shaderFloatStr, m_strawberry.GetFloat(m_shaderFloatStr) - m_lemonOffest / 30);
}
}
if (m_orangeOffest < m_orangeNum && m_orange)
{
m_orangeOffest += Time.deltaTime * m_speed;
if(m_lemon.GetFloat(m_shaderFloatStr) >= 1.0f)
{
m_orange.SetFloat(m_shaderFloatStr, 0.9f - m_orangeOffest / 10);
}
else
{
m_orange.SetFloat(m_shaderFloatStr, m_lemon.GetFloat(m_shaderFloatStr) - m_orangeOffest / 30);
}
}
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
if (m_strawberryOffest >= m_strawberryMaxNum && m_lemonOffest >= m_lemonMaxNum
&& m_bControl)
{
m_bControl = false;
BattleCtrl.instance.OnBattleWin();
}
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
if (m_strawberryOffest >= m_strawberryMaxNum && m_lemonOffest >= m_lemonMaxNum
&& m_orangeOffest >= m_orangeMaxNum && m_bControl)
{
m_bControl = false;
BattleCtrl.instance.OnBattleWin();
}
}
}
//private void OnDestroy()
//{
// m_orange.SetFloat(m_shaderFloatStr, 1.0f);
// m_lemon.SetFloat(m_shaderFloatStr, 1.0f);
// m_strawberry.SetFloat(m_shaderFloatStr, 1.0f);
//}
}
3D Fruit/Assets/#A2_Scripts/Battle/View/Glass1View.cs.meta 0 → 100644
View file @ 74afdf22
fileFormatVersion: 2
guid: c298a08be82a8cf429599b7d9df852e7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A2_Scripts/Battle/View/GlassView.cs
View file @ 74afdf22
......@@ -24,24 +24,39 @@ public class GlassView : MonoBehaviour
private bool m_bControl = true;
private float m_speed = 2.0f;
private float m_startPos = 0.28f;
private void Awake()
{
m_strawberry.gameObject.SetActive(false);
m_lemon.gameObject.SetActive(false);
if(m_orange)
{
m_orange.gameObject.SetActive(false);
}
}
//数量
public void SetFruitNum(int num1,int num2,int num3)
{
m_strawberryNum += num1;
if (m_strawberryNum > m_strawberryMaxNum)
if (m_strawberryNum >= m_strawberryMaxNum)
{
m_strawberryNum = m_strawberryMaxNum;
BattleCtrl.instance.battleUI.SetStrawberryState(true);
}
m_lemonNum += num2;
if(m_lemonNum > m_lemonMaxNum)
if(m_lemonNum >= m_lemonMaxNum)
{
m_lemonNum = m_lemonMaxNum;
BattleCtrl.instance.battleUI.SetLemonState(true);
}
m_orangeNum += num3;
if(m_orangeNum > m_orangeMaxNum)
if(m_orangeNum >= m_orangeMaxNum)
{
m_orangeNum = m_orangeMaxNum;
BattleCtrl.instance.battleUI.SetOrangeState(true);
}
}
private void Update()
......@@ -52,57 +67,65 @@ public class GlassView : MonoBehaviour
}
if (m_strawberryOffest < m_strawberryNum)
{
m_strawberry.gameObject.SetActive(true);
m_strawberryOffest += Time.deltaTime * m_speed;
Vector3 varSize = m_strawberry.localScale;
varSize.y = m_strawberryOffest/10.0f;
varSize.y = m_strawberryOffest;
m_strawberry.localScale = varSize;
//草莓位置
Vector3 varPosStrawberry = m_strawberry.localPosition;
varPosStrawberry.y = m_startPos;
m_strawberry.localPosition = varPosStrawberry;
//柠檬位置
Vector3 varPos = m_lemon.localPosition;
varPos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f;
varPos.y = m_startPos + m_strawberry.localScale.y / 10.0f;
m_lemon.localPosition = varPos;
//橙子位置
if(m_orange)
{
Vector3 varOrangePos = m_orange.localPosition;
varOrangePos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f
+ m_lemon.localScale.y / 10.0f + m_lemon.localScale.y / 60.0f;
varOrangePos.y = m_startPos + m_strawberry.localScale.y / 10.0f
+ m_lemon.localScale.y / 10.0f;
m_orange.localPosition = varOrangePos;
}
}
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/10.0f;
varSize.y = m_lemonOffest;
m_lemon.localScale = varSize;
Vector3 varPos = m_lemon.localPosition;
varPos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f;
varPos.y = m_startPos+m_strawberry.localScale.y / 10.0f;
m_lemon.localPosition = varPos;
if (m_orange)
{
Vector3 varOrangePos = m_orange.localPosition;
varOrangePos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f
+ m_lemon.localScale.y / 10.0f + m_lemon.localScale.y / 60.0f;
varOrangePos.y = m_startPos + m_strawberry.localScale.y / 10.0f
+ m_lemon.localScale.y / 10.0f;
m_orange.localPosition = varOrangePos;
}
}
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 / 10.0f;
varSize.y = m_orangeOffest;
m_orange.localScale = varSize;
Vector3 varPos = m_orange.localPosition;
varPos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f
+ m_lemon.localScale.y / 10.0f + m_lemon.localScale.y / 60.0f;
varPos.y = m_startPos+m_strawberry.localScale.y / 10.0f
+ m_lemon.localScale.y / 10.0f;
m_orange.localPosition = varPos;
}
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 74afdf22
This diff is collapsed.
3D Fruit/Assets/#C1_Models/Cup3.fbx.meta 0 → 100644
View file @ 74afdf22
fileFormatVersion: 2
guid: 13948debcb4aa0146939d84a4c31e265
ModelImporter:
serializedVersion: 19300
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/game/LiquidBottle 2.mat
View file @ 74afdf22
......@@ -112,7 +112,7 @@ Material:
- _EnableExternalAlpha: 0
- _Exposure: 1
- _Extrusion: 1
- _FillAmount: 0.734
- _FillAmount: 1
- _FlipbookMode: 0
- _FoamLineWidth: 0.0051
- _FresnelPower: 10
......
3D Fruit/Assets/#C3_Materials/game/LiquidBottle 3.mat
View file @ 74afdf22
......@@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
m_CustomRenderQueue: 2430
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
......@@ -62,7 +62,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _FillAmount: 0.785
- _FillAmount: 1
- _FoamLineWidth: 0.0051
- _GlossMapScale: 1
- _Glossiness: 0.5
......@@ -93,5 +93,5 @@ Material:
- _LiquidRimColor: {r: 0.25943398, g: 1, b: 0.7759454, a: 1}
- _LiquidTopColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _Tint: {r: 0.17657915, g: 0.88235295, b: 0.09803921, a: 1}
- _TopColor: {r: 0.40408695, g: 0.98039216, b: 0.20784315, a: 1}
- _Tint: {r: 0.90196085, g: 0.62352943, b: 0.003921569, a: 1}
- _TopColor: {r: 0.9019608, g: 0.62352943, b: 0.003921569, a: 1}
3D Fruit/Assets/#C3_Materials/game/LiquidBottle 4.mat 0 → 100644
View file @ 74afdf22
%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: LiquidBottle 4
m_Shader: {fileID: 4800000, guid: ef722c40702bdfc47a4082f7e7d1d70a, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2440
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: 0}
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_Floats:
- _BottleSpecularGloss: 1
- _BottleThickness: 0.001
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _FillAmount: 1
- _FoamLineWidth: 0.0051
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _LiquidRimIntensity: 0
- _LiquidRimPower: 2
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rim: 0
- _RimPower: 1.04
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _WobbleX: 0
- _WobbleZ: 0
- _ZWrite: 1
m_Colors:
- _BottleColor: {r: 0.9528302, g: 0.9528302, b: 0.9528302, a: 0.09803922}
- _BottleSpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FoamColor: {r: 1, g: 0.8820755, b: 0.8820755, a: 1}
- _LiquidColor: {r: 1, g: 0.5235849, b: 0.5235849, a: 1}
- _LiquidFoamColor: {r: 1, g: 1, b: 1, a: 1}
- _LiquidRimColor: {r: 0.25943398, g: 1, b: 0.7759454, a: 1}
- _LiquidTopColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _Tint: {r: 0.9670751, g: 1, b: 0, a: 1}
- _TopColor: {r: 0.96862745, g: 1, b: 0, a: 1}
3D Fruit/Assets/#C3_Materials/game/LiquidBottle 4.mat.meta 0 → 100644
View file @ 74afdf22
fileFormatVersion: 2
guid: 884d73dba5252d84db9d04286d22a397
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#Z4_Icons/Blent it Match.png.meta 0 → 100644
View file @ 74afdf22
fileFormatVersion: 2
guid: 16ff43a59d13e3341a8df793e97d9883
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#Z4_Icons/Blent-it-Match_icon.png.meta 0 → 100644
View file @ 74afdf22
fileFormatVersion: 2
guid: 9ab8eeb86b394b64db201255c1ebebdb
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @ 74afdf22
......@@ -1450,6 +1450,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_glassView: {fileID: 4057659938803460645}
m_glass1View: {fileID: 0}
m_animator: {fileID: 3473518863980440131}
m_fruitParent: {fileID: 6664447788583718008}
m_highLightEffect: {fileID: 2419814893742932198}
m_cutTrans: {fileID: 0}
......@@ -3303,8 +3305,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4016695623467733542}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.76}
m_LocalScale: {x: 25, y: 0, z: 25}
m_Children: []
m_Father: {fileID: 2532882320877503867}
m_RootOrder: 1
......@@ -3677,7 +3679,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5509142045040149469}
m_Mesh: {fileID: -4119317738140548247, guid: 42ded01e453656143b8b1876dc94eb77, type: 3}
m_Mesh: {fileID: -4119317738140548247, guid: 13948debcb4aa0146939d84a4c31e265, type: 3}
--- !u!23 &5024360187149003466
MeshRenderer:
m_ObjectHideFlags: 0
......@@ -3972,8 +3974,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6044377297644492860}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0, z: 1}
m_LocalPosition: {x: -0, y: 0, z: 0.76}
m_LocalScale: {x: 25, y: 0, z: 25}
m_Children: []
m_Father: {fileID: 2532882320877503867}
m_RootOrder: 2
......@@ -4628,6 +4630,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 359853305674000139}
m_PrefabAsset: {fileID: 0}
--- !u!95 &3473518863980440131 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 3803887659397336392, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
m_PrefabInstance: {fileID: 359853305674000139}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &853374032285843243
PrefabInstance:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/Res/Levels/Level1.prefab
View file @ 74afdf22
......@@ -155,7 +155,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1190327345913838262
Transform:
m_ObjectHideFlags: 0
......@@ -243,7 +243,7 @@ Transform:
m_GameObject: {fileID: 2142305358739686495}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 5, y: 2.4805737, z: 5}
m_LocalScale: {x: 0.33702, y: 0.33702, z: 0.33702}
m_Children:
- {fileID: 2153696898578379108}
- {fileID: 5881045071721360484}
......@@ -1146,7 +1146,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2419814893315684943
Transform:
m_ObjectHideFlags: 0
......@@ -1656,6 +1656,7 @@ Transform:
- {fileID: 6664447788583718008}
- {fileID: 7272851732066831365}
- {fileID: 4143540499663807236}
- {fileID: 125640775644677704}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1952,10 +1953,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_glassView: {fileID: 4057659938803460645}
m_glass1View: {fileID: 0}
m_animator: {fileID: 125640775644677710}
m_fruitParent: {fileID: 6664447788583718008}
m_highLightEffect: {fileID: 2419814893742932198}
m_cutTrans: {fileID: 0}
lineMaterial: {fileID: 0}
--- !u!1 &2419814894024991057
GameObject:
m_ObjectHideFlags: 0
......@@ -3760,8 +3762,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2919837586193837975}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.76}
m_LocalScale: {x: 25, y: 0, z: 25}
m_Children: []
m_Father: {fileID: 2532882320877503867}
m_RootOrder: 1
......@@ -3830,7 +3832,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &8732719001263257071
Transform:
m_ObjectHideFlags: 0
......@@ -3910,7 +3912,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1242631683105714375
Transform:
m_ObjectHideFlags: 0
......@@ -3998,8 +4000,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5537882261351490957}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0, z: 1}
m_LocalPosition: {x: -0, y: 0, z: 0.76}
m_LocalScale: {x: 25, y: 0, z: 25}
m_Children: []
m_Father: {fileID: 2532882320877503867}
m_RootOrder: 2
......@@ -4141,8 +4143,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6003039039774162540}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -0, y: 0, z: 0.76}
m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
m_Children: []
m_Father: {fileID: 2532882320877503867}
m_RootOrder: 0
......@@ -4154,7 +4156,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6003039039774162540}
m_Mesh: {fileID: -7671204574982233823, guid: 90eee04922c34b64cb3976e763b2cc56, type: 3}
m_Mesh: {fileID: -4119317738140548247, guid: 13948debcb4aa0146939d84a4c31e265, type: 3}
--- !u!23 &6521616105535068027
MeshRenderer:
m_ObjectHideFlags: 0
......@@ -4576,8 +4578,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7108539652630706621}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.76}
m_LocalScale: {x: 25, y: 0, z: 25}
m_Children: []
m_Father: {fileID: 2532882320877503867}
m_RootOrder: 3
......@@ -5079,3 +5081,84 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2419814894761420575}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3851776366882441990
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2419814893835863036}
m_Modifications:
- target: {fileID: 3803887659397336397, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_Name
value: juice_node
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.4
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7d9ffec4a1f76704f98876999774e4c7, type: 3}
--- !u!4 &125640775644677704 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3803887659397336398, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
m_PrefabInstance: {fileID: 3851776366882441990}
m_PrefabAsset: {fileID: 0}
--- !u!95 &125640775644677710 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 3803887659397336392, guid: 7d9ffec4a1f76704f98876999774e4c7,
type: 3}
m_PrefabInstance: {fileID: 3851776366882441990}
m_PrefabAsset: {fileID: 0}
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @ 74afdf22
This diff is collapsed.
3D Fruit/ProjectSettings/ProjectSettings.asset
View file @ 74afdf22
......@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: Dyspace
productName: Blend Match 3D
productName: Blent it Match
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
......@@ -262,7 +262,7 @@ PlayerSettings:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 0}
m_Icon: {fileID: 2800000, guid: 9ab8eeb86b394b64db201255c1ebebdb, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
......
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