Skip to content

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

画线实现优化

parent 1db2cb89
Hide whitespace changes
Inline Side-by-side
Showing with 1172 additions and 85 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ 6d7d15e9
......@@ -167,6 +167,7 @@ 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
......
3D Fruit/Assets/#A2_Scripts/Battle/Trigger/FifthLevelTrigger.cs
View file @ 6d7d15e9
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
//using Obi;
public class FifthLevelTrigger : MonoBehaviour
......@@ -8,63 +10,224 @@ public class FifthLevelTrigger : MonoBehaviour
//public Transform m_topTrans;
//private Rigidbody[] m_rigidBody;
//private bool m_bControl = true;
public Transform m_mousePosTrans;
public float m_speed = 1.0f;
private bool m_bEnterGround = true;
private bool m_bEnterSuccessTarget = false;
private Rigidbody m_mouseRigidBody;
private Vector3 m_DefaultPos = new Vector3(2.18f,1.61f,-1.13f);
private Vector3 m_dirPos = new Vector3(1.19f, 0, -2.11f);
//public Transform m_mousePosTrans;
//public float m_speed = 1.0f;
//private bool m_bEnterGround = true;
//private bool m_bEnterSuccessTarget = false;
//private Rigidbody m_mouseRigidBody;
//private Vector3 m_DefaultPos = new Vector3(2.18f,1.61f,-1.13f);
//private Vector3 m_dirPos = new Vector3(1.19f, 0, -2.11f);
//private void Start()
//{
// m_mouseRigidBody = m_mousePosTrans.gameObject.GetComponent<Rigidbody>();
// BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterTarget += onBalloonEnterTarget;
// BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterGround += onBalloonEnterGround;
// BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterSuccessTarget += onBalloonEnterSuccessTarget;
// //m_rigidBody = gameObject.GetComponentsInChildren<Rigidbody>();
//}
//void onBalloonEnterTarget()
//{
// m_bEnterGround = false;
//}
//void onBalloonEnterGround()
//{
// m_bEnterGround = true;
//}
//void onBalloonEnterSuccessTarget()
//{
// m_bEnterSuccessTarget = true;
//}
//// Update is called once per frame
//void Update()
//{
// //if(m_bControl)
// //{
// // if(m_topTrans.position.y < 6)
// // {
// // m_bControl = false;
// // BattleCtrl.instance.OnBattleWin();
// // }
// //}
// if(m_bEnterGround)
// {
// transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
// }
// if(m_bEnterSuccessTarget)
// {
// m_bEnterSuccessTarget = false;
// m_mouseRigidBody.isKinematic = true;
// m_mousePosTrans.localPosition = m_DefaultPos;
// }
// else
// {
// if(m_mouseRigidBody.isKinematic)
// {
// //transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
// transform.localPosition = Vector3.Lerp(transform.localPosition, m_dirPos, 0.03f);
// transform.rotation = Quaternion.Slerp(transform.rotation, Quaternion.identity, 0.03f);
// }
// }
//}
public Color mColor = Color.black;//画笔颜色
//[HideInInspector]
public Texture brushTexture;//画笔
[HideInInspector]
public float brushScale = 0.1f;//画笔大小
[HideInInspector]
public bool isEraser = false;//是否使用橡皮擦
private RenderTexture texRender;//接收图的RenderTexture
private Material mat;//材质球
private RawImage rImage;//RawImage,自身
private RectTransform rTransform;//RectTransform
private Vector3 startPosition = Vector3.zero;
private Vector3 endPosition = Vector3.zero;
private Vector2 posOffset;
private void Start()
{
m_mouseRigidBody = m_mousePosTrans.gameObject.GetComponent<Rigidbody>();
BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterTarget += onBalloonEnterTarget;
BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterGround += onBalloonEnterGround;
BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterSuccessTarget += onBalloonEnterSuccessTarget;
//m_rigidBody = gameObject.GetComponentsInChildren<Rigidbody>();
}
void onBalloonEnterTarget()
{
m_bEnterGround = false;
}
void onBalloonEnterGround()
{
m_bEnterGround = true;
SetPainting();
posOffset.Set((Screen.width - rTransform.sizeDelta.x * transform.root.localScale.x) / 2 + transform.position.x - transform.root.position.x, (Screen.height - rTransform.sizeDelta.y * transform.root.localScale.y) / 2 + transform.position.y - transform.root.position.y);
}
void onBalloonEnterSuccessTarget()
{
m_bEnterSuccessTarget = true;
}
// Update is called once per frame
void Update()
void OnGUI()
{
//if(m_bControl)
//if (MouseOverController.GetOverUI(transform.root.gameObject) == null)
//{
// if(m_topTrans.position.y < 6)
// {
// m_bControl = false;
// BattleCtrl.instance.OnBattleWin();
// }
// EndPainting();
// return;
//}
if(m_bEnterGround)
//else if (MouseOverController.GetOverUI(transform.root.gameObject).name != gameObject.name)
//{
// EndPainting();
// return;
//}
if (Input.GetMouseButton(0))
{
transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
StartPainting(new Vector3(Input.mousePosition.x - posOffset.x, Input.mousePosition.y - posOffset.y, 0));
}
if(m_bEnterSuccessTarget)
if (Input.GetMouseButtonUp(0))
{
EndPainting();
}
}
/// <summary>
/// 初始化设置
/// </summary>
public void SetPainting()
{
rTransform = GetComponent<RectTransform>();
mat = new Material(Shader.Find("Custom/Painting"));
texRender = new RenderTexture((int)rTransform.sizeDelta.x, (int)rTransform.sizeDelta.y, 24, RenderTextureFormat.ARGB32);
Clear(texRender);
rImage = GetComponent<RawImage>();
Debug.Log(rImage);
rImage.texture = texRender;
}
/// <summary>
/// 开始画线
/// </summary>
/// <param name="pos"></param>
public void StartPainting(Vector3 pos)
{
endPosition = pos;
if (startPosition.Equals(Vector3.zero))
{
m_bEnterSuccessTarget = false;
m_mouseRigidBody.isKinematic = true;
m_mousePosTrans.localPosition = m_DefaultPos;
startPosition = endPosition;
return;
}
else
float distance = Vector3.Distance(startPosition, endPosition);
if (distance > 1)
{
if(m_mouseRigidBody.isKinematic)
int d = (int)distance;
for (int i = 0; i < d; i++)
{
//transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
transform.localPosition = Vector3.Lerp(transform.localPosition, m_dirPos, 0.03f);
transform.rotation = Quaternion.Slerp(transform.rotation, Quaternion.identity, 0.03f);
float difx = endPosition.x - startPosition.x;
float dify = endPosition.y - startPosition.y;
float delta = (float)i / distance;
if (isEraser)
{
DrawBrush(texRender, new Vector2(startPosition.x + (difx * delta), startPosition.y + (dify * delta)), brushTexture, Color.white, brushScale);
}
else
{
DrawBrush(texRender, new Vector2(startPosition.x + (difx * delta), startPosition.y + (dify * delta)), brushTexture, mColor, brushScale);
}
}
}
startPosition = endPosition;
}
/// <summary>
/// 结束画线
/// </summary>
public void EndPainting()
{
startPosition = Vector3.zero;
}
private void DrawBrush(RenderTexture destTexture, Vector2 pos, Texture sourceTexture, Color color, float scale)
{
DrawBrush(destTexture, (int)pos.x, (int)pos.y, sourceTexture, color, scale);
}
private void DrawBrush(RenderTexture destTexture, int x, int y, Texture sourceTexture, Color color, float scale)
{
DrawBrush(destTexture, new Rect(x, y, sourceTexture.width, sourceTexture.height), sourceTexture, color, scale);
}
private void DrawBrush(RenderTexture destTexture, Rect destRect, Texture sourceTexture, Color color, float scale)
{
//Graphics.SetRenderTarget(destTexture);
float left = destRect.xMin - destRect.width * scale / 2.0f;
float right = destRect.xMin + destRect.width * scale / 2.0f;
float top = destRect.yMin - destRect.height * scale / 2.0f;
float bottom = destRect.yMin + destRect.height * scale / 2.0f;
Debug.LogError("AAAAA");
GL.PushMatrix();
GL.LoadOrtho();
mat.SetTexture("_MainTex", brushTexture);
mat.SetColor("_Color", color);
mat.SetPass(0);
GL.Begin(GL.QUADS);
/*GL.TexCoord2(0.0f, 0.0f); */GL.Vertex3(left / (int)rTransform.sizeDelta.x / transform.root.localScale.x, top / (int)rTransform.sizeDelta.y / transform.root.localScale.y, 0);
/*GL.TexCoord2(1.0f, 0.0f); */GL.Vertex3(right / (int)rTransform.sizeDelta.x / transform.root.localScale.x, top / (int)rTransform.sizeDelta.y / transform.root.localScale.y, 0);
/*GL.TexCoord2(1.0f, 1.0f); */GL.Vertex3(right / (int)rTransform.sizeDelta.x / transform.root.localScale.x, bottom / (int)rTransform.sizeDelta.y / transform.root.localScale.y, 0);
/*GL.TexCoord2(0.0f, 1.0f); */GL.Vertex3(left / (int)rTransform.sizeDelta.x / transform.root.localScale.x, bottom / (int)rTransform.sizeDelta.y / transform.root.localScale.y, 0);
GL.End();
GL.PopMatrix();
}
/// <summary>
/// 重置RenderTexture
/// </summary>
/// <param name="destTexture"></param>
private void Clear(RenderTexture destTexture)
{
Graphics.SetRenderTarget(destTexture);
GL.PushMatrix();
GL.Clear(true, true, Color.white);
GL.PopMatrix();
}
/// <summary>
/// 外部可以调用的重置修改的RenderTexture
/// </summary>
public void ClearAll()
{
Clear(texRender);
}
}
3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 6d7d15e9
......@@ -43,6 +43,7 @@ public class BattleUI : MonoBehaviour
public GameObject m_symbolObj;//十字架图标
public GameObject m_takeBtnObj;//take按钮
public Text m_moveNumText;//移动次数
public LineUI m_lineUI;
public Action onStartBtn;
public Action onPosUpBtn;
public Action onPosDownBtn;
......@@ -57,6 +58,10 @@ public class BattleUI : MonoBehaviour
private int m_bombIndex = 0;//炸弹计数
private bool m_bResult = false;//结果
private bool m_bIsDebug = false;//是否开启调试模式
//线的处理
private Stack<GameObject> m_objStack = new Stack<GameObject>();
private List<GameObject> m_objList = 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);
......@@ -293,7 +298,8 @@ public class BattleUI : MonoBehaviour
varPos.y = -400.0f;
m_fruitSecondLineObj.SetActive(false);
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
varPos.y = -286.0f;
m_fruitSecondLineObj.SetActive(true);
......@@ -435,4 +441,57 @@ public class BattleUI : MonoBehaviour
{
m_bResult = value;
}
//------------------------线处理--------------------------------------
GameObject GetPoolObject()
{
GameObject varGo = null;
if (m_objStack.Count > 0)
{
varGo = m_objStack.Pop();
}
else
{
varGo = GameObject.Instantiate(m_lineUI.gameObject);
m_objList.Add(varGo);
}
varGo.SetActive(true);
varGo.transform.SetParent(m_battleObj.transform,false);
return varGo;
}
void ReturnObjectToPool(GameObject go)
{
if (go)
{
m_objStack.Push(go);
go.SetActive(false);
}
}
//设置线
public void DrawLine(Vector3 startP, Vector3 finalP)
{
GameObject varObj = GetPoolObject();
LineUI varLine = varObj.GetComponent<LineUI>();
if (varLine)
{
varLine.DrawLine(startP, finalP);
}
}
//回收
public void RecycleLine()
{
for (int i = 0; i < m_objList.Count; i++)
{
ReturnObjectToPool(m_objList[i]);
}
}
private void OnDestroy()
{
for (int i = 0; i < m_objList.Count; i++)
{
GameObject.Destroy(m_objList[i]);
}
m_objList.Clear();
m_objList = null;
m_objStack = null;
}
}
3D Fruit/Assets/#A2_Scripts/Battle/UI/LineUI.cs 0 → 100644
View file @ 6d7d15e9
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class LineUI : MonoBehaviour
{
public Image m_imageLine;//线
public Image m_imageLineStart;
public Image m_imageLineFinal;
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.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.z = 0;
Vector3 rightPosition = (varStart + varFinal) / 2;
Vector3 rightRotation = varFinal - varStart;
float HalfLength = Vector3.Distance(varStart, varFinal);
//float LThickness = 0.1f;//线的粗细
//创建圆柱体
//GameObject MyLine = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.lineObj);
m_imageLine.transform.localPosition = rightPosition;
m_imageLine.transform.localRotation = Quaternion.FromToRotation(Vector3.up, rightRotation);
Vector2 varSize = m_imageLine.rectTransform.sizeDelta;
varSize.x = 250.0f;
varSize.y = HalfLength;
m_imageLine.rectTransform.sizeDelta = varSize;
m_imageLineStart.transform.localPosition = varStart;
m_imageLineFinal.transform.localPosition = varFinal;
}
}
3D Fruit/Assets/#A2_Scripts/Battle/UI/LineUI.cs.meta 0 → 100644
View file @ 6d7d15e9
fileFormatVersion: 2
guid: ceee747a2c9327449991aeb01fa5a363
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ 6d7d15e9
......@@ -7,6 +7,7 @@ public class FruitView : MonoBehaviour
public GlassView m_glassView;
public Transform m_fruitParent;
public HighlightingEffect m_highLightEffect;
public Transform m_cutTrans;//旋转叶片
private List<FruitItemView> m_selectLst = new List<FruitItemView>();//选中的水果
private int m_lineIndex = 0;//线段计数
private FruitItemView m_curSelectItem;//当前选中的
......@@ -25,7 +26,8 @@ public class FruitView : MonoBehaviour
{
GlobalConfig.LoadFirstLevelDefaultFruit(m_fruitParent);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
GlobalConfig.LoadSecondLevelDefaultFruit(m_fruitParent);
}
......@@ -70,11 +72,12 @@ public class FruitView : MonoBehaviour
m_bIsTouchUp = true;
m_lastSelectItem = null;
//线段回收
for (int i = 0; i < m_lineLst.Count; i++)
{
PoolManager.Instance.ReturnObjectToPool(m_lineLst[i]);
}
m_lineLst.Clear();
//for (int i = 0; i < m_lineLst.Count; i++)
//{
// PoolManager.Instance.ReturnObjectToPool(m_lineLst[i]);
//}
//m_lineLst.Clear();
BattleCtrl.instance.battleUI.RecycleLine();
//高亮重置
for (int i = 0; i < m_selectLst.Count; i++)
{
......@@ -231,7 +234,8 @@ public class FruitView : MonoBehaviour
{
GlobalConfig.LoadFirstRandomFruit(m_SelectNum, m_fruitParent);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
GlobalConfig.LoadSecondRandomFruit(m_SelectNum, m_fruitParent);
}
......@@ -307,6 +311,7 @@ public class FruitView : MonoBehaviour
// Update is called once per frame
void Update()
{
UpdateCutRotate();
if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle || m_moveNum == 0)
{
return;
......@@ -317,6 +322,14 @@ public class FruitView : MonoBehaviour
}
UpdateSelectSize();
}
//旋转叶片
void UpdateCutRotate()
{
if(m_cutTrans)
{
m_cutTrans.Rotate(Vector3.up*10.0f, Space.World);
}
}
void Clicked()
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
......@@ -346,7 +359,11 @@ public class FruitView : MonoBehaviour
}
if(m_lastSelectItem)
{
DrawLS(m_lastSelectItem.transform, m_curSelectItem.transform);
Vector3 varVec3Last = Camera.main.WorldToScreenPoint(m_lastSelectItem.transform.position);
Vector3 varVec3Cur = Camera.main.WorldToScreenPoint(m_curSelectItem.transform.position);
BattleCtrl.instance.battleUI.DrawLine(varVec3Last, varVec3Cur);
//DrawLS(m_lastSelectItem.transform, m_curSelectItem.transform);
}
m_selectLst.Add(varHitTrans);
}
......@@ -383,9 +400,9 @@ public class FruitView : MonoBehaviour
void DrawLS(Transform startP, Transform finalP)
{
Vector3 varStart = startP.position;
varStart.z = 0;
//varStart.z = 0;
Vector3 varFinal = finalP.position;
varFinal.z = 0;
//varFinal.z = 0;
Vector3 rightPosition = (varStart + varFinal) / 2;
Vector3 rightRotation = varFinal - varStart;
float HalfLength = Vector3.Distance(varStart, varFinal) / 2;
......@@ -393,7 +410,7 @@ public class FruitView : MonoBehaviour
//创建圆柱体
GameObject MyLine = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.lineObj);
rightPosition.z = -0.5f;
rightPosition.z = -2.0f;
MyLine.transform.position = rightPosition;
MyLine.transform.rotation = Quaternion.FromToRotation(Vector3.up, rightRotation);
MyLine.transform.localScale = new Vector3(LThickness, HalfLength, LThickness);
......@@ -464,6 +481,71 @@ public class FruitView : MonoBehaviour
}
}
}
//-------------------------------------GL画线--------------------------------------
private bool beginDraw = false;
private Vector3 curPos = Vector3.zero;
private float interval = 0.1f;
private List<Vector3> posList = new List<Vector3>();
public Material lineMaterial;
void sOnGUI()
{
Event e = Event.current;
if (e != null && e.type != null)
{
if (e.type == EventType.MouseDown)
{
beginDraw = true;
}
if (e.type == EventType.MouseDrag)
{
if (Vector3.Distance(curPos, Input.mousePosition) > interval)
{
curPos = Input.mousePosition;
posList.Add(new Vector3(curPos.x / Screen.width, curPos.y / Screen.height, 0));
}
}
if (e.type == EventType.MouseUp)
{
beginDraw = false;
ClearLines();
}
}
DrawLine();
}
void ClearLines()
{
beginDraw = false;
posList.Clear();
curPos = Vector3.zero;
GL.PushMatrix();
GL.Clear(true, true, Color.white);
GL.PopMatrix();
}
void DrawLine()
{
if (!beginDraw)
return;
GL.PushMatrix();
GL.LoadOrtho();
lineMaterial.SetPass(0);
GL.Begin(GL.QUADS);
for (int i = 0; i < posList.Count - 1; i++)
{
Vector3 pos = posList[i];
GL.Vertex3(pos.x, pos.y, pos.z);
GL.Vertex3(posList[i + 1].x, posList[i + 1].y, posList[i + 1].z);
}
GL.End();
GL.PopMatrix();
}
//-------------------------------------GL画线--------------------------------------
private void OnDestroy()
{
if (GameServices.inputService != null)
......@@ -480,5 +562,6 @@ public class FruitView : MonoBehaviour
m_fruitBombEffect = null;
//m_fruitDropEffect.Clear();
m_fruitDropEffect = null;
SetFruitRigidState(false);
}
}
3D Fruit/Assets/#A2_Scripts/Battle/View/GlassView.cs
View file @ 6d7d15e9
......@@ -58,10 +58,12 @@ public class GlassView : MonoBehaviour
varSize.y = m_strawberryOffest/10.0f;
m_strawberry.localScale = varSize;
//柠檬位置
Vector3 varPos = m_lemon.localPosition;
varPos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f;
m_lemon.localPosition = varPos;
//橙子位置
if(m_orange)
{
Vector3 varOrangePos = m_orange.localPosition;
......@@ -112,7 +114,8 @@ public class GlassView : MonoBehaviour
BattleCtrl.instance.OnBattleWin();
}
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
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)
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 6d7d15e9
......@@ -58,6 +58,134 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &222345269
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 222345271}
- component: {fileID: 222345270}
m_Layer: 5
m_Name: ImageLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &222345271
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 222345269}
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:
- {fileID: 247691584}
- {fileID: 1686706038}
- {fileID: 1695185053}
m_Father: {fileID: 6064464676328073067}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &222345270
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 222345269}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ceee747a2c9327449991aeb01fa5a363, type: 3}
m_Name:
m_EditorClassIdentifier:
m_imageLine: {fileID: 247691582}
m_imageLineStart: {fileID: 1686706040}
m_imageLineFinal: {fileID: 1695185051}
--- !u!1 &247691581
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 247691584}
- component: {fileID: 247691583}
- component: {fileID: 247691582}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &247691584
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 247691581}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 222345271}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &247691583
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 247691581}
m_CullTransparentMesh: 0
--- !u!114 &247691582
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 247691581}
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: 0
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
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!1 &583032563
GameObject:
m_ObjectHideFlags: 0
......@@ -623,6 +751,154 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &1686706037
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1686706038}
- component: {fileID: 1686706039}
- component: {fileID: 1686706040}
m_Layer: 5
m_Name: ImageStart
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1686706038
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1686706037}
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: 222345271}
m_RootOrder: 1
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: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1686706039
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1686706037}
m_CullTransparentMesh: 0
--- !u!114 &1686706040
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1686706037}
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: 0
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e6d3c39ddf7d366498ecf318b9a3cfe0, 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!1 &1695185050
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1695185053}
- component: {fileID: 1695185052}
- component: {fileID: 1695185051}
m_Layer: 5
m_Name: ImageFinal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1695185053
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1695185050}
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: 222345271}
m_RootOrder: 2
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: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1695185052
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1695185050}
m_CullTransparentMesh: 0
--- !u!114 &1695185051
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1695185050}
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: 0
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e6d3c39ddf7d366498ecf318b9a3cfe0, 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!1 &1920425757
GameObject:
m_ObjectHideFlags: 0
......@@ -848,9 +1124,9 @@ RectTransform:
m_Father: {fileID: 1518767726}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -2.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2122888659
......@@ -1688,9 +1964,9 @@ RectTransform:
m_Father: {fileID: 1518767726}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -107.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1028847026378544125
......@@ -5955,7 +6231,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: '?'
m_Text: 3
--- !u!1 &5494452178133196282
GameObject:
m_ObjectHideFlags: 0
......@@ -10471,9 +10747,9 @@ RectTransform:
m_Father: {fileID: 1518767726}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -212.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9065902244082100770
......@@ -10637,6 +10913,7 @@ RectTransform:
- {fileID: 5181902483590371204}
- {fileID: 1518767726}
- {fileID: 6111148557972933165}
- {fileID: 222345271}
m_Father: {fileID: 6064464677632144690}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -11898,7 +12175,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -11915,7 +12192,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677159922112}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -11969,7 +12246,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677159922112}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......@@ -12744,6 +13021,7 @@ MonoBehaviour:
m_symbolObj: {fileID: 8615814293053379064}
m_takeBtnObj: {fileID: 7938503036084442980}
m_moveNumText: {fileID: 1881638514107634254}
m_lineUI: {fileID: 222345270}
--- !u!114 &1995691973
MonoBehaviour:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/#C3_Materials/ORANGE-YELLOW 7.mat
View file @ 6d7d15e9
......@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ORANGE-YELLOW 5
m_Name: ORANGE-YELLOW 7
m_Shader: {fileID: 4800000, guid: 4609c28b77ae6c04689a8ba2b2fccba7, type: 3}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
......
3D Fruit/Assets/#C3_Materials/brush.mat 0 → 100644
View file @ 6d7d15e9
%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: brush
m_Shader: {fileID: 4800000, guid: 6145fb7ee06e2d941b49733a684e8dfd, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
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: 84c8db9d523db493bbee5d1a4fe58ecb, 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_Floats:
- _BumpScale: 1
- _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
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 0.7185301, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
3D Fruit/Assets/#C3_Materials/brush.mat.meta 0 → 100644
View file @ 6d7d15e9
fileFormatVersion: 2
guid: cbea56823be0b4e4c85924b6489dfe10
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/game/LiquidBottle 2.mat
View file @ 6d7d15e9
......@@ -112,7 +112,7 @@ Material:
- _EnableExternalAlpha: 0
- _Exposure: 1
- _Extrusion: 1
- _FillAmount: 0.16
- _FillAmount: 0.734
- _FlipbookMode: 0
- _FoamLineWidth: 0.0051
- _FresnelPower: 10
......
3D Fruit/Assets/#C3_Materials/game/LiquidBottle 3.mat
View file @ 6d7d15e9
......@@ -62,7 +62,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _FillAmount: 0.313
- _FillAmount: 0.785
- _FoamLineWidth: 0.0051
- _GlossMapScale: 1
- _Glossiness: 0.5
......
3D Fruit/Assets/#D2_Shaders/brush.shader 0 → 100644
View file @ 6d7d15e9
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader "Custom/Painting"
{
Properties
{
_MainTex("MainTex (RGB) Trans (A)", 2D) = "white" {}
_Color("Color", Color) = (1,1,1,1)
}
SubShader
{
Tags
{
"Queue" = "Transparent"
"IgnoreProjector" = "True"
"RenderType" = "Transparent"
"PreviewType" = "Plane"
"CanUseSpriteAtlas" = "True"
}
Cull Off
Lighting Off
ZWrite Off
Fog{ Mode Off }
Blend One OneMinusSrcAlpha
Pass
{
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#include "UnityCG.cginc"
struct v2f
{
float4 vertex : SV_POSITION;
half2 texcoord : TEXCOORD0;
};
fixed4 _Color;
v2f vert(appdata_base IN)
{
v2f OUT;
OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord;
return OUT;
}
sampler2D _MainTex;
fixed4 frag(v2f IN) : SV_Target
{
float4 col = _Color * tex2D(_MainTex, IN.texcoord);
col.rgb *= col.a;
return col;
}
ENDCG
}
}
}
\ No newline at end of file
3D Fruit/Assets/#D2_Shaders/brush.shader.meta 0 → 100644
View file @ 6d7d15e9
fileFormatVersion: 2
guid: 6145fb7ee06e2d941b49733a684e8dfd
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @ 6d7d15e9
......@@ -1468,7 +1468,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2419814893742932194}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.36, z: -1.697292}
m_LocalPosition: {x: 0, y: -0.5, z: -1.697292}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2419814894216345595}
......@@ -1500,7 +1500,7 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 1.43
m_Depth: -1
m_CullingMask:
......@@ -1872,6 +1872,8 @@ MonoBehaviour:
m_glassView: {fileID: 4057659938803460645}
m_fruitParent: {fileID: 6664447788583718008}
m_highLightEffect: {fileID: 2419814893742932198}
m_cutTrans: {fileID: 0}
lineMaterial: {fileID: 2100000, guid: cbea56823be0b4e4c85924b6489dfe10, type: 2}
--- !u!1 &2419814894024991057
GameObject:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/Res/Levels/Level1.prefab
View file @ 6d7d15e9
......@@ -1550,7 +1550,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2419814893742932194}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.36, z: -1.697292}
m_LocalPosition: {x: 0, y: -0.5, z: -1.697292}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2419814894216345595}
......@@ -1582,7 +1582,7 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 1.43
m_Depth: -1
m_CullingMask:
......@@ -1954,6 +1954,8 @@ MonoBehaviour:
m_glassView: {fileID: 4057659938803460645}
m_fruitParent: {fileID: 6664447788583718008}
m_highLightEffect: {fileID: 2419814893742932198}
m_cutTrans: {fileID: 0}
lineMaterial: {fileID: 0}
--- !u!1 &2419814894024991057
GameObject:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @ 6d7d15e9
......@@ -217,6 +217,85 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &1792625346382626161
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8441781913538348119}
- component: {fileID: 2216450282380266389}
- component: {fileID: 1415172416995174927}
m_Layer: 1
m_Name: LemonIcon
m_TagString: Target
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8441781913538348119
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792625346382626161}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.59999996, y: 0.50919235, z: 0.314}
m_LocalScale: {x: 0.099999994, y: 0.062009998, z: 0.099999994}
m_Children: []
m_Father: {fileID: 2843078749762103824}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2216450282380266389
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792625346382626161}
m_Mesh: {fileID: 4300000, guid: eba8e396b76814ee08f820a7510ac548, type: 3}
--- !u!23 &1415172416995174927
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792625346382626161}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: ba597bbf94a5d43ed86f3a1a7ac87b60, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &1953537195897530660
GameObject:
m_ObjectHideFlags: 0
......@@ -375,7 +454,7 @@ Transform:
m_Children:
- {fileID: 4078020735526424906}
m_Father: {fileID: 2824403712326926783}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2824403711518518681
GameObject:
......@@ -475,10 +554,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
stencilZBufferDepth: 0
_downsampleFactor: 4
iterations: 2
blurMinSpread: 0.65
blurSpread: 0.25
_blurIntensity: 0.3
iterations: 3
blurMinSpread: 1
blurSpread: 1
_blurIntensity: 0.9
--- !u!1 &2824403711604385226
GameObject:
m_ObjectHideFlags: 0
......@@ -514,7 +593,7 @@ Transform:
- {fileID: 2824403711915177076}
- {fileID: 2824403711614165045}
m_Father: {fileID: 2824403712326926783}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2824403711614165044
GameObject:
......@@ -1786,6 +1865,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2843078749762103824}
- {fileID: 2824403711604385227}
- {fileID: 2824403711372269364}
m_Father: {fileID: 2824403712614641131}
......@@ -2827,7 +2907,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_fruitView: {fileID: 6588424727091633392}
curLevelIndex: 0
curLevelIndex: 2
--- !u!114 &6588424727091633392
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2842,7 +2922,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_glassView: {fileID: 4533172995854878558}
m_fruitParent: {fileID: 6546680321722540291}
m_highLightEffect: {fileID: 0}
m_highLightEffect: {fileID: 2824403711518518685}
m_cutTrans: {fileID: 3454792661722715154}
lineMaterial: {fileID: 2100000, guid: 14035e08b5bac6b41a8a36daced43348, type: 2}
--- !u!1 &2824403712881052794
GameObject:
m_ObjectHideFlags: 0
......@@ -3629,7 +3711,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2824403713259628638}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0.72, y: -0.8553241, z: 0.602708}
m_LocalScale: {x: 0.1, y: 0.26240805, z: 0.10000002}
m_Children: []
......@@ -3808,6 +3890,119 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &3430532859515279966
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2843078749762103824}
m_Layer: 0
m_Name: "\u6A21\u578B\u56FE\u6807"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2843078749762103824
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3430532859515279966}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.089, y: -0.306, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2392827710542219872}
- {fileID: 8441781913538348119}
- {fileID: 6841947060910493337}
m_Father: {fileID: 2824403712326926783}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3993585364123020897
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6841947060910493337}
- component: {fileID: 6820462835702163459}
- component: {fileID: 5234700692358776512}
m_Layer: 1
m_Name: OrangeIcon
m_TagString: Target
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6841947060910493337
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3993585364123020897}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.59999996, y: 0.6828326, z: 0.314}
m_LocalScale: {x: 0.089999996, y: 0.062009998, z: 0.089999996}
m_Children: []
m_Father: {fileID: 2843078749762103824}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6820462835702163459
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3993585364123020897}
m_Mesh: {fileID: 4300000, guid: 29bf4e1a4bf0a4f68b045abb4d1e0d6d, type: 3}
--- !u!23 &5234700692358776512
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3993585364123020897}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 51ade4e3b1e5f43b68664d9f56c96c75, type: 2}
- {fileID: 2100000, guid: b32716083db33400ab37bd2a2eacf529, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &4193842330701726437
GameObject:
m_ObjectHideFlags: 0
......@@ -4545,6 +4740,86 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_type: 2
--- !u!1 &6834043555838152020
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2392827710542219872}
- component: {fileID: 1879460833027390672}
- component: {fileID: 8081698556261148138}
m_Layer: 1
m_Name: StrawberryIcon
m_TagString: Target
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2392827710542219872
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6834043555838152020}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.59999996, y: 0.3355521, z: 0.314}
m_LocalScale: {x: 0.125, y: 0.08682, z: 0.125}
m_Children: []
m_Father: {fileID: 2843078749762103824}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1879460833027390672
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6834043555838152020}
m_Mesh: {fileID: 4300000, guid: 1d2005142320f402ea48aa15bd615650, type: 3}
--- !u!23 &8081698556261148138
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6834043555838152020}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5df44f85b46604bc78b1eb648f77794a, type: 2}
- {fileID: 2100000, guid: 684ddefe277794134ac3fb2cc8e9018b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &7129365238812232995
GameObject:
m_ObjectHideFlags: 0
......@@ -5007,6 +5282,16 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 5eb5fa9eac7a48847ac5d0e3127e43a8, type: 2}
- target: {fileID: 5914173064080830018, guid: 89f902003b1d6014db8f7fb8bd89c5ec,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5914173064080830018, guid: 89f902003b1d6014db8f7fb8bd89c5ec,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6752566947609992337, guid: 89f902003b1d6014db8f7fb8bd89c5ec,
type: 3}
propertyPath: m_Materials.Array.data[0]
......@@ -5026,3 +5311,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 9071022117346310736}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3454792661722715154 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5914173064080830018, guid: 89f902003b1d6014db8f7fb8bd89c5ec,
type: 3}
m_PrefabInstance: {fileID: 9071022117346310736}
m_PrefabAsset: {fileID: 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