Skip to content

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

新需求修改

parent ff6a75ba
Hide whitespace changes
Inline Side-by-side
Showing with 600 additions and 53 deletions
3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 47da1462
......@@ -134,6 +134,10 @@ public class BattleUI : MonoBehaviour
private GameObject m_fruitParentObj;
public bool IsLeftEmtryBomb { get { return m_bombIndex >= 3; } }//是否不剩炸弹了
public bool IsBombButtonCanInteractable { get { return m_boomBtn.interactable; } }
//调试模式
private TestGestureAround m_testGesture;
public bool IsTest => m_testGesture && m_testGesture.enabled;
void Awake()
{
m_dragBtn.onClick.AddListener(SetDragMode);
......@@ -160,6 +164,7 @@ public class BattleUI : MonoBehaviour
BattleCtrl.instance.levelManager.selectLevel.onMoveFinish = MoveFinish;
m_resultStartPosY = m_successResultObj.GetComponent<RectTransform>().anchoredPosition.y;
m_fruitParentObj = m_fruitIconObj.transform.parent.gameObject;
m_testGesture = GetComponent<TestGestureAround>();
}
void SetDragMode()
{
......
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ 47da1462
......@@ -20,6 +20,7 @@ public class FruitView : MonoBehaviour
public CheeseView m_cheeseView;//涂奶酪
public Transform m_sceneTrans;//场景
public Transform m_parentNode;//水果父节点
public Transform m_knifeTrans;
//public EndlessContainer m_containerLeft;//左边流体控制
//public EndlessContainer m_containerRight;//右边流体控制
//public GameObject m_strawberryEffect;//草莓特效
......@@ -106,6 +107,9 @@ public class FruitView : MonoBehaviour
private Quaternion m_m_rightNodeRotation = Quaternion.Euler(-9.834f, -18.59f, -96.063f);
//按下Ok键
private bool m_bOk = false;
//刀
private int m_curPathIndex = 0;
private List<Vector3> m_pathPos = new List<Vector3>();
private void Awake()
{
//if (m_animator)
......@@ -306,7 +310,8 @@ public class FruitView : MonoBehaviour
// 抬起回调
void OnTouchUp()
{
BattleCtrl.instance.battleUI.SetKnifePos(0, 0);
m_knifeTrans.gameObject.SetActive(false);
//BattleCtrl.instance.battleUI.SetKnifePos(0, 0);
if (BattleCtrl.instance.isEndBattle || m_bOk)
{
return;
......@@ -862,7 +867,7 @@ public class FruitView : MonoBehaviour
//计算combo
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
if (varFishNum > 0 || varEggNum > 0)
if (varFishNum > 1 || varEggNum > 1)
{
m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varFishNum + varEggNum;
......@@ -876,10 +881,10 @@ public class FruitView : MonoBehaviour
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
if (varStrawberryNum > 0 || varOrangeNum > 0)
if (varOrangeNum > 1)
{
m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varStrawberryNum + varOrangeNum;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varOrangeNum;
}
else
{
......@@ -888,7 +893,7 @@ public class FruitView : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
if (varGlobeNum > 0)
if (varGlobeNum > 1)
{
m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varGlobeNum;
......@@ -900,7 +905,7 @@ public class FruitView : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{
if (varCabbageNum > 0 || varOrangeNum > 0)
if (varCabbageNum > 1 || varOrangeNum > 1)
{
m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varCabbageNum + varOrangeNum;
......@@ -912,7 +917,7 @@ public class FruitView : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
if (varFootBallNum > 0 || varBasketBallNum > 0)
if (varFootBallNum > 1 || varBasketBallNum > 1)
{
m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varFootBallNum + varBasketBallNum;
......@@ -948,7 +953,7 @@ public class FruitView : MonoBehaviour
//BattleCtrl.instance.battleUI.SetLemonNum(m_lemonTotalNum);
//BattleCtrl.instance.battleUI.SetOrangeNum(m_orangeTotalNum);
m_firstTotalNum += varStrawberryNum + varLemonNum + varOrangeNum + varFishNum + varEggNum;
m_secondTotalNum += varPepperNum + varTomatoNum + varStrawberryNum + varOrangeNum;
m_secondTotalNum += varPepperNum + varTomatoNum + varCabbageNum + varOrangeNum;
m_thirdTotalNum += varFootBallNum + varBasketBallNum + varVolleyBallNum + varGlobeNum;
m_fourthTotalNum += varCabbageNum + varOrangeNum + varBurgerNum + varCokeNum + varFrenchFriesNum;
m_fifthTotalNum += varCubeNum + varFootBallNum + varBasketBallNum;
......@@ -978,7 +983,7 @@ public class FruitView : MonoBehaviour
{
//BattleCtrl.instance.battleUI.SetNeedIconNum(m_secondTotalNum);
int varBadNum = varStrawberryNum + varOrangeNum;
int varBadNum = varOrangeNum;
int varGoodNum = varPepperNum + varTomatoNum;
if (varBadNum > 0)
{
......@@ -1048,7 +1053,7 @@ public class FruitView : MonoBehaviour
{
GameServices.timerServices.Push(this, 0.8f, delegate
{
m_glassView.SetFirstNum(varStrawberryNum, varOrangeNum, varPepperNum, varTomatoNum);
m_glassView.SetFirstNum(varCabbageNum, varOrangeNum, varPepperNum, varTomatoNum);
BattleCtrl.instance.levelManager.curLevel.CalculateStar();
});
}
......@@ -1122,6 +1127,13 @@ public class FruitView : MonoBehaviour
{
return;
}
if(Input.GetMouseButtonDown(0))
{
Vector3 pos = Camera.main.WorldToScreenPoint(m_knifeTrans.position);//将对象坐标换成屏幕坐标
Vector3 mousePos = new Vector3(Input.mousePosition.x, Input.mousePosition.y, pos.z);//让鼠标的屏幕坐标与对象坐标一致
Vector3 modelPos = Camera.main.ScreenToWorldPoint(mousePos);
m_knifeTrans.position = modelPos;
}
if (Input.GetMouseButton(0))
{
Clicked();
......@@ -1414,6 +1426,35 @@ public class FruitView : MonoBehaviour
Destroy(m_cheeseView.gameObject);
}
}
void UpdateKnife()
{
m_knifeTrans.gameObject.SetActive(true);
Vector3 pos = Camera.main.WorldToScreenPoint(m_knifeTrans.position);//将对象坐标换成屏幕坐标
Vector3 mousePos = new Vector3(Input.mousePosition.x, Input.mousePosition.y, pos.z);//让鼠标的屏幕坐标与对象坐标一致
Vector3 modelPos = Camera.main.ScreenToWorldPoint(mousePos);
//modelPos.x = 7.0f;
//modelPos.y -= 2.5f;
Vector3 targetDir = (modelPos - m_knifeTrans.position).normalized;
float varAngle = Vector3.Dot(targetDir, Vector3.right);
//if (!targetDir.Equals(Vector3.zero))
//{
// Quaternion targetRotation = Quaternion.LookRotation(targetDir, Vector3.up);
// m_knifeTrans.rotation = Quaternion.Lerp(m_knifeTrans.rotation, targetRotation, 0.2f);
//}
Vector3 varQua = m_knifeTrans.localEulerAngles;
varQua.x = -30.0f;
varQua.y = 0.0f;
varQua.z = varAngle * Mathf.Rad2Deg;
m_knifeTrans.localEulerAngles = varQua;
m_knifeTrans.position = Vector3.Lerp(m_knifeTrans.position, modelPos, 0.5f);
//m_curPathIndex++;
//if (m_curPathIndex >= m_pathPos.Count)
//{
// m_curPathIndex = 0;
// m_pathPos.Clear();
//}
}
void Clicked()
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
......@@ -1424,9 +1465,13 @@ public class FruitView : MonoBehaviour
{
if (hit.collider && hit.collider.gameObject.CompareTag("Target"))
{
float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth) -100.0f;
float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth) - 100.0f;
BattleCtrl.instance.battleUI.SetKnifePos(varX, varY);
if(BattleCtrl.instance.battleUI.IsTest)
{
UpdateKnife();
}
//float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth) -100.0f;
//float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth) - 100.0f;
//BattleCtrl.instance.battleUI.SetKnifePos(varX, varY);
FruitItemView varHitTrans = hit.collider.transform.GetComponent<FruitItemView>();
if (!m_selectLst.Contains(varHitTrans))
{
......
3D Fruit/Assets/#A2_Scripts/Services/GlobalConfig.cs
View file @ 47da1462
......@@ -227,16 +227,19 @@ public class GlobalConfig
}
for (int i = 0; i < 3; i++)
{
int varRand = Random.Range(0, 4);
GameObject varObj = null;
//if (varRand == 3)
//{
// varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
//}
//else
if(i == 0)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
}
else if(i == 1)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FishObj);
}
else
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
}
//varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = new Vector3(0,90,90);
......@@ -285,7 +288,7 @@ public class GlobalConfig
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
......@@ -297,7 +300,7 @@ public class GlobalConfig
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.TomatoObj);
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.CabbageObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
......@@ -484,7 +487,7 @@ public class GlobalConfig
float varZ = parent.localPosition.z;
for (int i = 0; i < num; i++)
{
int varRand = Random.Range(0, 15);
int varRand = Random.Range(0, 14);
GameObject varObj = null;
if (varRand >= 0 && varRand < 4)
{
......@@ -492,17 +495,13 @@ public class GlobalConfig
}
else if (varRand >= 4 && varRand < 8)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.PepperObj);
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.CabbageObj);
}
else if (varRand >= 8 && varRand < 13)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.TomatoObj);
}
else if (varRand == 13)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
}
else if (varRand == 14)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
}
......@@ -812,7 +811,7 @@ public class GlobalConfig
varBody[i].isKinematic = value;
}
}
Transform varStrawberry = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.StrawberryObj);
Transform varStrawberry = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.CabbageObj);
if (varStrawberry)
{
Rigidbody[] varBody = varStrawberry.GetComponentsInChildren<Rigidbody>(true);
......@@ -1027,7 +1026,7 @@ public class GlobalConfig
}
varLemonberry.localPosition = Vector3.zero;
}
Transform varOrangeberry = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.StrawberryObj);
Transform varOrangeberry = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.CabbageObj);
if (varOrangeberry)
{
Rigidbody[] varBody = varOrangeberry.GetComponentsInChildren<Rigidbody>();
......@@ -1194,7 +1193,7 @@ public class GlobalConfig
{
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.PepperObj, value);
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.TomatoObj, value);
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.StrawberryObj, value);
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.CabbageObj, value);
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.OrangeObj, value);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
......@@ -1257,7 +1256,7 @@ public class GlobalConfig
{
varBasketBall.SetParent(parent);
}
Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.StrawberryObj);
Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.CabbageObj);
if (varVolleyBall)
{
varVolleyBall.SetParent(parent);
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 47da1462
......@@ -1170,8 +1170,8 @@ RectTransform:
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: 39, y: 200.1}
m_SizeDelta: {x: 128, y: 113}
m_AnchoredPosition: {x: 70, y: 234}
m_SizeDelta: {x: 180, y: 180}
m_Pivot: {x: 1, y: 1}
--- !u!222 &2327830968569671603
CanvasRenderer:
......@@ -13043,8 +13043,8 @@ RectTransform:
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: 39, y: 195.1}
m_SizeDelta: {x: 130, y: 96}
m_AnchoredPosition: {x: 70, y: 234}
m_SizeDelta: {x: 180, y: 180}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1592692148306579845
CanvasRenderer:
......
3D Fruit/Assets/#A3_Prefabs/FruitPrefab/Fish.prefab
View file @ 47da1462
......@@ -253,7 +253,7 @@ Transform:
m_GameObject: {fileID: 563478473935006277}
m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.4, z: 0.2}
m_LocalScale: {x: 0.3, y: 0.6, z: 0.3}
m_Children:
- {fileID: 2160570068955732269}
m_Father: {fileID: 0}
......
3D Fruit/Assets/#A3_Prefabs/Knife.prefab 0 → 100644
View file @ 47da1462
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5078506816792742586
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8079777492283570345}
- component: {fileID: 971128720440754847}
- component: {fileID: 6793307330319941222}
m_Layer: 0
m_Name: Knife
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8079777492283570345
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5078506816792742586}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &971128720440754847
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5078506816792742586}
m_Mesh: {fileID: -9013424565745891206, guid: b6b6ae64cb232ab409d2ff74b6990584, type: 3}
--- !u!23 &6793307330319941222
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5078506816792742586}
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: 2c37cfa2351550c49a517fca70f5eb32, 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
3D Fruit/Assets/#A3_Prefabs/Knife.prefab.meta 0 → 100644
View file @ 47da1462
fileFormatVersion: 2
guid: db7c99e8b26a75245b4c2c92be1eac59
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/Assets/#C3_Materials/Juiceshader/Material/Orange_juice1.mat
View file @ 47da1462
......@@ -84,10 +84,10 @@ Material:
- _CameraOffset: {r: 0.2, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FoamColor: {r: 1, g: 0.32941177, b: 0, a: 0}
- _FoamColor: {r: 0.99215686, g: 0.50980395, b: 0.023529412, a: 0}
- _ForceDir: {r: 0, g: 0, b: 0, a: 0}
- _LiquidCameraOffset: {r: 0.1, g: 0.1, b: 0.1, a: 0.1}
- _LiquidRimColor: {r: 1, g: 0.99797845, b: 0.9858491, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _SectionColor: {r: 1, g: 0.32941177, b: 0, a: 1}
- _WaterColor: {r: 1, g: 0.33131796, b: 0, a: 1}
- _SectionColor: {r: 0.9921569, g: 0.50980395, b: 0.023529414, a: 1}
- _WaterColor: {r: 0.99215686, g: 0.50980395, b: 0.023529412, a: 1}
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @ 47da1462
......@@ -129,6 +129,7 @@ Transform:
- {fileID: 2419814894656923382}
- {fileID: 5332178590545132912}
- {fileID: 8565684653088732079}
- {fileID: 1496230762044412698}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -2246,6 +2247,7 @@ MonoBehaviour:
m_cheeseView: {fileID: 9043597689013836524}
m_sceneTrans: {fileID: 6066320927539679196}
m_parentNode: {fileID: 8565684653088732079}
m_knifeTrans: {fileID: 1496230762044412698}
--- !u!1 &2419814894139061658
GameObject:
m_ObjectHideFlags: 0
......@@ -6826,6 +6828,86 @@ PolygonCollider2D:
- {x: -0.4812889, y: 2.2421455}
- {x: 0.3952198, y: 2.3396091}
- {x: 1.3644868, y: 2.5013695}
--- !u!1001 &7269530122479823795
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6066320927539679196}
m_Modifications:
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_Name
value: Knife
objectReference: {fileID: 0}
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db7c99e8b26a75245b4c2c92be1eac59, type: 3}
--- !u!4 &1496230762044412698 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
m_PrefabInstance: {fileID: 7269530122479823795}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7603026451685384052
PrefabInstance:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/Res/Levels/Level1.prefab
View file @ 47da1462
......@@ -129,6 +129,7 @@ Transform:
- {fileID: 2419814894656923382}
- {fileID: 4565523947062844117}
- {fileID: 8565684653088732079}
- {fileID: 3382611781205660600}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -2440,6 +2441,7 @@ MonoBehaviour:
m_cheeseView: {fileID: 5010076329370254921}
m_sceneTrans: {fileID: 6066320927539679196}
m_parentNode: {fileID: 8565684653088732079}
m_knifeTrans: {fileID: 3382611781205660600}
--- !u!1 &2419814894139061658
GameObject:
m_ObjectHideFlags: 0
......@@ -6759,7 +6761,7 @@ GameObject:
- component: {fileID: 440544129922766999}
- component: {fileID: 3062103222870479741}
m_Layer: 0
m_Name: Strawberry
m_Name: Cabbage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -6805,7 +6807,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: c7d1ea752094af7449153d5406cdc49b, type: 2}
- {fileID: 2100000, guid: 524149dd267525d45b12c131b3e2c41d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -6913,6 +6915,86 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2d99a7fe465cdfa4b85f5c040265762b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6832050434502470417
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6066320927539679196}
m_Modifications:
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_Name
value: Knife
objectReference: {fileID: 0}
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db7c99e8b26a75245b4c2c92be1eac59, type: 3}
--- !u!4 &3382611781205660600 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
m_PrefabInstance: {fileID: 6832050434502470417}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7603026451685384052
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -7123,15 +7205,15 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 7603026451685384052}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4291997889932276022 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5914173064080830018, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
m_PrefabInstance: {fileID: 7603026451685384052}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8882207789937095801 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -7872133085688272115, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
m_PrefabInstance: {fileID: 7603026451685384052}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4291997889932276022 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5914173064080830018, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
m_PrefabInstance: {fileID: 7603026451685384052}
m_PrefabAsset: {fileID: 0}
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @ 47da1462
......@@ -2114,6 +2114,7 @@ MonoBehaviour:
m_cheeseView: {fileID: 7498806024578210314}
m_sceneTrans: {fileID: 2073360469839470708}
m_parentNode: {fileID: 2084873888083434921}
m_knifeTrans: {fileID: 5272464843835632752}
--- !u!1 &2419814894139061658
GameObject:
m_ObjectHideFlags: 0
......@@ -4968,6 +4969,7 @@ Transform:
- {fileID: 2419814893835863036}
- {fileID: 2419814894656923382}
- {fileID: 2084873888083434921}
- {fileID: 5272464843835632752}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -5816,6 +5818,86 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1001 &4110286747945719001
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2073360469839470708}
m_Modifications:
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_Name
value: Knife
objectReference: {fileID: 0}
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db7c99e8b26a75245b4c2c92be1eac59, type: 3}
--- !u!4 &5272464843835632752 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
m_PrefabInstance: {fileID: 4110286747945719001}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7603026451685384052
PrefabInstance:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/Res/Levels/Level3.prefab
View file @ 47da1462
......@@ -129,6 +129,7 @@ Transform:
- {fileID: 2419814894656923382}
- {fileID: 3480327246458800740}
- {fileID: 8565684653088732079}
- {fileID: 6990951934722884298}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -528,7 +529,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 0aa4eb29b17467b4991359ef6a25152a, type: 2}
- {fileID: 2100000, guid: 9d37d33f1e91407418063a107dfaf12b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -907,7 +908,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 08e4817eee81f9b4185e7073c365e3f9, type: 2}
- {fileID: 2100000, guid: 563a76d0b04eecc41903c9ed7fe5dc04, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -2524,6 +2525,7 @@ MonoBehaviour:
m_cheeseView: {fileID: 1417575496785995088}
m_sceneTrans: {fileID: 6066320927539679196}
m_parentNode: {fileID: 8565684653088732079}
m_knifeTrans: {fileID: 6990951934722884298}
--- !u!1 &2419814894139061658
GameObject:
m_ObjectHideFlags: 0
......@@ -3306,7 +3308,7 @@ GameObject:
- component: {fileID: 3291460810699762903}
- component: {fileID: 7548281944191826091}
m_Layer: 0
m_Name: Tomato
m_Name: Orange
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -3352,7 +3354,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 0aa4eb29b17467b4991359ef6a25152a, type: 2}
- {fileID: 2100000, guid: 08e4817eee81f9b4185e7073c365e3f9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -3858,7 +3860,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 2baa7ea2c2a153d41ae6f96cd01dc5b4, type: 2}
- {fileID: 2100000, guid: 524149dd267525d45b12c131b3e2c41d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -6885,7 +6887,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: c7d1ea752094af7449153d5406cdc49b, type: 2}
- {fileID: 2100000, guid: ed2e04929ee06604c8f52ec09bc32c03, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -6993,6 +6995,86 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2d99a7fe465cdfa4b85f5c040265762b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1235670116964694627
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6066320927539679196}
m_Modifications:
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_Name
value: Knife
objectReference: {fileID: 0}
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db7c99e8b26a75245b4c2c92be1eac59, type: 3}
--- !u!4 &6990951934722884298 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
m_PrefabInstance: {fileID: 1235670116964694627}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7603026451685384052
PrefabInstance:
m_ObjectHideFlags: 0
......
3D Fruit/Assets/Res/Levels/Level4.prefab
View file @ 47da1462
......@@ -2114,6 +2114,7 @@ MonoBehaviour:
m_cheeseView: {fileID: 7835230763865515863}
m_sceneTrans: {fileID: 2073360469839470708}
m_parentNode: {fileID: 2084873888083434921}
m_knifeTrans: {fileID: 4104820842002486019}
--- !u!1 &2419814894139061658
GameObject:
m_ObjectHideFlags: 0
......@@ -4968,6 +4969,7 @@ Transform:
- {fileID: 2419814893835863036}
- {fileID: 2419814894656923382}
- {fileID: 2084873888083434921}
- {fileID: 4104820842002486019}
m_Father: {fileID: 2419814894692253840}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -5816,6 +5818,86 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1001 &5248490290862336938
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2073360469839470708}
m_Modifications:
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_Name
value: Knife
objectReference: {fileID: 0}
- target: {fileID: 5078506816792742586, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db7c99e8b26a75245b4c2c92be1eac59, type: 3}
--- !u!4 &4104820842002486019 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8079777492283570345, guid: db7c99e8b26a75245b4c2c92be1eac59,
type: 3}
m_PrefabInstance: {fileID: 5248490290862336938}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7603026451685384052
PrefabInstance:
m_ObjectHideFlags: 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