Skip to content

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

镜头调整

parent e049895b
Show whitespace changes
Inline Side-by-side
Showing with 224818 additions and 223716 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ 7eaf4c59
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 7eaf4c59
......@@ -67,6 +67,9 @@ public class BattleUI : MonoBehaviour
public GameObject m_playerRawImageObj;
public GameObject m_fruitIconObj;
public GameObject m_sportIconObj;
public GameObject m_threeIconObj;
public GameObject m_fourIconObj;
public GameObject m_fiveIconObj;
public Text m_needIconNum;//需要多少数量
public GameObject m_needIconSymbol;//数量✔
public GameObject[] m_starArrayObj;//星级
......@@ -337,7 +340,7 @@ public class BattleUI : MonoBehaviour
//胜利延迟
void DelayWin()
{
//BattleCtrl.instance.levelManager.selectLevel.CameraMoveDown();
BattleCtrl.instance.levelManager.selectLevel.CameraMoveDown();
m_nextLevelBtn.gameObject.SetActive(false);
m_successObj.SetActive(true);
m_selectLevelObj.SetActive(false);
......@@ -359,7 +362,7 @@ public class BattleUI : MonoBehaviour
float varNoOtherAmount = varNoOtherPro == 0 ? 1 : 0;
RectTransform varRT = m_successResultObj.GetComponent<RectTransform>();
Vector2 varVec2 = varRT.anchoredPosition;
varVec2.y = 21.0f;
varVec2.y = 23.0f;
varRT.DOAnchorPos(varVec2, 1.0f).onComplete = delegate ()
{
m_sq = DOTween.Sequence();
......@@ -465,22 +468,32 @@ public class BattleUI : MonoBehaviour
//水果位置
GlobalConfig.SetFruitRandomNum();
Vector2 varPos = m_fruitGroupRT.anchoredPosition;
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
HideAllFruitIcon();
//Vector2 varPos = m_fruitGroupRT.anchoredPosition;
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
varPos.y = -400.0f;
//varPos.y = -400.0f;
m_fruitSecondLineObj.SetActive(false);
m_fruitIconObj.SetActive(true);
m_sportIconObj.SetActive(false);
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex
|| BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
varPos.y = -286.0f;
//varPos.y = -286.0f;
m_fruitSecondLineObj.SetActive(true);
m_fruitIconObj.SetActive(false);
m_sportIconObj.SetActive(true);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
m_threeIconObj.SetActive(true);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{
m_fourIconObj.SetActive(true);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
m_fiveIconObj.SetActive(true);
}
//m_fruitGroupRT.anchoredPosition = varPos;
m_moveNumText.text = string.Format("{0:d}", GlobalConfig.FruitMoveTotalNum);
......@@ -491,10 +504,19 @@ public class BattleUI : MonoBehaviour
SetLemonNum(0);
SetOrangeNum(0);
SetNeedIconState(false);
SetNeedIconNum(0);
//SetNeedIconNum(0);
ResetResult();
m_bLoadSceneFinish = true;
}
//隐藏所有icon
void HideAllFruitIcon()
{
m_fruitIconObj.SetActive(false);
m_sportIconObj.SetActive(false);
m_threeIconObj.SetActive(false);
m_fourIconObj.SetActive(false);
m_fiveIconObj.SetActive(false);
}
//设置移动次数
public void SetMoveNum(int num)
{
......@@ -962,7 +984,7 @@ public class BattleUI : MonoBehaviour
GlobalConfig.SetFruitRigidState(false);
//选择场景镜头
BattleCtrl.instance.levelManager.curLevel.fruitView.SetCupWaterPos();
BattleCtrl.instance.levelManager.selectLevel.SetCameraPosAndRotation();
//BattleCtrl.instance.levelManager.selectLevel.SetCameraPosAndRotation();
}
}
else
......@@ -972,7 +994,7 @@ public class BattleUI : MonoBehaviour
{
m_fadeAlpha = 0.0f;
m_bMainToSelect = false;
//OnBattleWin();
OnBattleWin();
}
}
}
......
3D Fruit/Assets/#A2_Scripts/Battle/UI/DecorateUI.cs
View file @ 7eaf4c59
......@@ -31,11 +31,13 @@ public class DecorateUI : MonoBehaviour
//阶段1
private float m_curStage1Progress = 0.0f;
private RectTransform m_image1RT;
public Action m_StopStage1Action;
public Action<float> m_StartStage1Action;
public Action m_FinishStage1;
//阶段2
private float m_curStage2Progress = 0.0f;
private RectTransform m_image2RT;
public Action m_StopStage2Action;
public Action<float> m_StartStage2Action;
public Action m_FinishStage2;
......@@ -43,6 +45,9 @@ public class DecorateUI : MonoBehaviour
public Action m_prop1Action;
public Action m_prop2Action;
public Action m_prop3Action;
private float m_imageStartPosX = 0.0f;//开始x位置
private float m_progressDis = 410.0f;//长度
// Start is called before the first frame update
void Awake()
{
......@@ -51,6 +56,15 @@ public class DecorateUI : MonoBehaviour
m_button3.onClick.AddListener(OnButton3);
m_buttonStage1.onClick.AddListener(OnButtonStage1);
m_buttonStage2.onClick.AddListener(OnButtonStage2);
if(m_progressStage1Image)
{
m_image1RT = m_progressStage1Image.GetComponent<RectTransform>();
m_imageStartPosX = m_image1RT.anchoredPosition.x;
}
if(m_progressStage2Image)
{
m_image2RT = m_progressStage2Image.GetComponent<RectTransform>();
}
}
void OnButton1()
{
......@@ -110,11 +124,21 @@ public class DecorateUI : MonoBehaviour
public void ResetState()
{
m_curStage1Progress = 0;
m_progressStage1Image.fillAmount = 0;
if(m_image1RT)
{
Vector2 varVec1 = m_image1RT.anchoredPosition;
varVec1.x = m_imageStartPosX;
m_image1RT.anchoredPosition = varVec1;
}
m_buttonStage1.gameObject.SetActive(false);
m_curStage2Progress = 0;
m_progressStage2Image.fillAmount = 0;
if(m_image2RT)
{
Vector2 varVec2 = m_image2RT.anchoredPosition;
varVec2.x = m_imageStartPosX;
m_image2RT.anchoredPosition = varVec2;
}
m_buttonStage2.gameObject.SetActive(false);
m_curProgress = 0;
......@@ -150,7 +174,10 @@ public class DecorateUI : MonoBehaviour
{
m_StartStage1Action?.Invoke(m_curStage1Progress);
}
m_progressStage1Image.fillAmount = m_curStage1Progress;
Vector2 varVec = m_image1RT.anchoredPosition;
varVec.x = m_imageStartPosX + m_progressDis * m_curStage1Progress;
m_image1RT.anchoredPosition = varVec;
//m_progressStage1Image.fillAmount = m_curStage1Progress;
}
if (m_curStage1Progress >= 0.5f)
{
......@@ -178,7 +205,10 @@ public class DecorateUI : MonoBehaviour
{
m_StartStage2Action?.Invoke(m_curStage2Progress);
}
m_progressStage2Image.fillAmount = m_curStage2Progress;
Vector2 varVec = m_image2RT.anchoredPosition;
varVec.x = m_imageStartPosX + m_progressDis * m_curStage2Progress;
m_image2RT.anchoredPosition = varVec;
//m_progressStage2Image.fillAmount = m_curStage2Progress;
}
if (m_curStage2Progress >= 0.5f)
{
......
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ 7eaf4c59
......@@ -70,8 +70,10 @@ public class FruitView : MonoBehaviour
//小球处理
private List<GameObject> m_smallBallLst = new List<GameObject>();
private List<Vector3> m_smallBallPosLst = new List<Vector3>();
private List<Vector3> m_smallBallSizeLst = new List<Vector3>();
//private List<Vector3> m_smallBallPosLst = new List<Vector3>();
//private List<Vector3> m_smallBallSizeLst = new List<Vector3>();
private Dictionary<int, List<Vector3>> m_smallBallPosDic = new Dictionary<int, List<Vector3>>();
private Dictionary<int, List<Vector3>> m_smallBallSizeDic = new Dictionary<int, List<Vector3>>();
//水特效处理
private int m_starwberryOneNum;
private int m_starwberryTwoNum;
......@@ -96,7 +98,7 @@ public class FruitView : MonoBehaviour
private Sequence m_sq;
//装饰完回到选择场景
private Vector3 m_backToSelectPos = new Vector3(-0.488f, 0.849f, -0.219f);
private Vector3 m_backToSelectPos = new Vector3(-0.488f, 0.96f, -0.219f);
private Vector3 m_backToSelectSize = Vector3.one * 0.2f;
//绑定右手节点
......@@ -197,6 +199,8 @@ public class FruitView : MonoBehaviour
//小球处理
void CreateSmallBall(FruitItemView view)
{
List<Vector3> varPosLst = new List<Vector3>();
List<Vector3> varSizeLst = new List<Vector3>();
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
GameObject varGo = null;
......@@ -221,9 +225,11 @@ public class FruitView : MonoBehaviour
Rigidbody[] varRigid = varGo.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varRigid.Length; i++)
{
m_smallBallPosLst.Add(varRigid[i].transform.localPosition);
m_smallBallSizeLst.Add(varRigid[i].transform.localScale);
varPosLst.Add(varRigid[i].transform.localPosition);
varSizeLst.Add(varRigid[i].transform.localScale);
}
m_smallBallPosDic.Add(varGo.GetInstanceID(), varPosLst);
m_smallBallSizeDic.Add(varGo.GetInstanceID(), varSizeLst);
varGo.transform.position = view.transform.position;
varGo.transform.rotation = Quaternion.identity;
m_smallBallLst.Add(varGo);
......@@ -249,9 +255,11 @@ public class FruitView : MonoBehaviour
Rigidbody[] varRigid = varGo.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varRigid.Length; i++)
{
m_smallBallPosLst.Add(varRigid[i].transform.localPosition);
m_smallBallSizeLst.Add(varRigid[i].transform.localScale);
varPosLst.Add(varRigid[i].transform.localPosition);
varSizeLst.Add(varRigid[i].transform.localScale);
}
m_smallBallPosDic.Add(varGo.GetInstanceID(), varPosLst);
m_smallBallSizeDic.Add(varGo.GetInstanceID(), varSizeLst);
varGo.transform.position = view.transform.position;
varGo.transform.rotation = Quaternion.identity;
m_smallBallLst.Add(varGo);
......@@ -273,17 +281,25 @@ public class FruitView : MonoBehaviour
m_smallBallLst[i].transform.localRotation = Quaternion.identity;
m_smallBallLst[i].transform.localScale = Vector3.one;
//位置
List<Vector3> varPosLst;
List<Vector3> varSizeLst;
if (m_smallBallPosDic.TryGetValue(m_smallBallLst[i].GetInstanceID(), out varPosLst) &&
m_smallBallSizeDic.TryGetValue(m_smallBallLst[i].GetInstanceID(), out varSizeLst))
{
Rigidbody[] varRigid = m_smallBallLst[i].GetComponentsInChildren<Rigidbody>();
for (int m = 0; m < varRigid.Length; m++)
{
varRigid[m].transform.localPosition = m_smallBallPosLst[m];
varRigid[m].transform.localPosition = varPosLst[m];
varRigid[m].transform.localRotation = Quaternion.identity;
varRigid[m].transform.localScale = m_smallBallSizeLst[m];
varRigid[m].transform.localScale = varSizeLst[m];
varRigid[m].velocity = Vector3.zero;
varRigid[m].angularVelocity = Vector3.zero;
}
}
}
m_smallBallLst.Clear();
m_smallBallPosDic.Clear();
m_smallBallSizeDic.Clear();
}
}
// 抬起回调
......@@ -943,7 +959,7 @@ public class FruitView : MonoBehaviour
////m_lemonEffect.SetActive(varLemonNum > 0);
//m_orangeEffect.SetActive(false);
//m_orangeEffect.SetActive(varStrawberryNum > 0 || varLemonNum > 0 || varOrangeNum > 0);
BattleCtrl.instance.battleUI.SetNeedIconNum(m_firstTotalNum);
//BattleCtrl.instance.battleUI.SetNeedIconNum(m_firstTotalNum);
int varBadNum = varFishNum + varEggNum;
int varGoodNum = varStrawberryNum + varOrangeNum;
......@@ -958,7 +974,7 @@ public class FruitView : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
BattleCtrl.instance.battleUI.SetNeedIconNum(m_secondTotalNum);
//BattleCtrl.instance.battleUI.SetNeedIconNum(m_secondTotalNum);
int varBadNum = varStrawberryNum + varOrangeNum;
int varGoodNum = varPepperNum + varTomatoNum;
......@@ -973,7 +989,7 @@ public class FruitView : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
BattleCtrl.instance.battleUI.SetNeedIconNum(m_thirdTotalNum);
//BattleCtrl.instance.battleUI.SetNeedIconNum(m_thirdTotalNum);
int varGoodNum = varFootBallNum + varBasketBallNum + varVolleyBallNum;
if (varGlobeNum > 0)
......@@ -987,7 +1003,7 @@ public class FruitView : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{
BattleCtrl.instance.battleUI.SetNeedIconNum(m_fourthTotalNum);
//BattleCtrl.instance.battleUI.SetNeedIconNum(m_fourthTotalNum);
int varBadNum = varCabbageNum + varTomatoNum;
int varGoodNum = varBurgerNum + varCokeNum + varFrenchFriesNum;
......@@ -1002,7 +1018,7 @@ public class FruitView : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
BattleCtrl.instance.battleUI.SetNeedIconNum(m_fifthTotalNum);
//BattleCtrl.instance.battleUI.SetNeedIconNum(m_fifthTotalNum);
int varBadNum = varFootBallNum + varBasketBallNum;
if (varBadNum > 0)
......
3D Fruit/Assets/#A2_Scripts/Battle/View/NpcFaceView.cs
View file @ 7eaf4c59
......@@ -63,6 +63,11 @@ public class NpcFaceView : MonoBehaviour
//释放动画
public void OnKill()
{
for (int i = 0; i < m_meshRender.Length; i++)
{
m_meshRender[i].sharedMaterial = m_normalMat;
m_meshRender[i].transform.localScale = Vector3.one;
}
m_sq.Kill();
}
}
3D Fruit/Assets/#A2_Scripts/Level/SelectLevelCtrl.cs
View file @ 7eaf4c59
......@@ -61,7 +61,7 @@ public class SelectLevelCtrl : MonoBehaviour
//镜头切换
private Vector3 m_StartCameraPos = new Vector3(0,0.82f,-0.66f);
private Vector3 m_FinalCameraPos = new Vector3(0, 1.64f, -1.56f);
private Quaternion m_StartCameraRotation = Quaternion.Euler(45, 0, 0);
private Quaternion m_StartCameraRotation = Quaternion.Euler(0, 0, 0);
// Start is called before the first frame update
void Start()
......@@ -172,9 +172,9 @@ public class SelectLevelCtrl : MonoBehaviour
{
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
m_boyTrans.gameObject.SetActive(true);
PlayBoyAnim(GlobalConfig.Ani_Walk);
PlayGirlAnim(GlobalConfig.Ani_Walk);
m_boyTrans.gameObject.SetActive(true);
m_sq = DOTween.Sequence();
m_sq.Append(m_girlTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_boyTrans.DOLocalMove(new Vector3(0,0,0.172f), 2.0f));
......@@ -182,9 +182,9 @@ public class SelectLevelCtrl : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
m_threeTrans.gameObject.SetActive(true);
PlayBoyAnim(GlobalConfig.Ani_Walk);
PlayThreeAnim(GlobalConfig.Ani_Walk);
m_threeTrans.gameObject.SetActive(true);
m_sq = DOTween.Sequence();
m_sq.Append(m_boyTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_threeTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
......@@ -192,9 +192,9 @@ public class SelectLevelCtrl : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
m_fourTrans.gameObject.SetActive(true);
PlayThreeAnim(GlobalConfig.Ani_Walk);
PlayFourAnim(GlobalConfig.Ani_Walk);
m_fourTrans.gameObject.SetActive(true);
m_sq = DOTween.Sequence();
m_sq.Append(m_threeTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_fourTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
......@@ -202,9 +202,9 @@ public class SelectLevelCtrl : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{
m_fiveTrans.gameObject.SetActive(true);
PlayFourAnim(GlobalConfig.Ani_Walk);
PlayFiveAnim(GlobalConfig.Ani_Walk);
m_fiveTrans.gameObject.SetActive(true);
m_sq = DOTween.Sequence();
m_sq.Append(m_fourTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_fiveTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
......@@ -212,9 +212,9 @@ public class SelectLevelCtrl : MonoBehaviour
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
m_girlTrans.gameObject.SetActive(true);
PlayFiveAnim(GlobalConfig.Ani_Walk);
PlayGirlAnim(GlobalConfig.Ani_Walk);
m_girlTrans.gameObject.SetActive(true);
m_sq = DOTween.Sequence();
m_sq.Append(m_fiveTrans.DOLocalMoveX(1.0f, 2.0f));
m_sq.Join(m_girlTrans.DOLocalMove(new Vector3(0, 0, 0.172f), 2.0f));
......@@ -248,7 +248,7 @@ public class SelectLevelCtrl : MonoBehaviour
PlayFiveAnim(GlobalConfig.Ani_Idle3);
m_fourNpcFace.OnKill();
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
m_fruitEffectObj.SetActive(true);
PlayGirlAnim(GlobalConfig.Ani_Idle3);
......@@ -309,9 +309,9 @@ public class SelectLevelCtrl : MonoBehaviour
public void CameraMoveDown()
{
Vector3 varPos = m_camera.position;
varPos.y = 0.3f;
varPos.y = 0.51f;
m_camera.DOMove(varPos, 1.0f).onComplete = delegate () {
DelayPlayCameraAni();
};
}
//镜头向上移动
......@@ -423,40 +423,45 @@ public class SelectLevelCtrl : MonoBehaviour
void DelayPlayCameraAni()
{
HideAllRole();
m_camera.DOLocalMove(m_FinalCameraPos, 0.5f).onComplete = delegate ()
{
//m_camera.DOLocalMove(m_FinalCameraPos, 0.5f).onComplete = delegate ()
//{
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
m_girlTrans.gameObject.SetActive(true);
m_boyTrans.gameObject.SetActive(true);
m_girlNpcFace.SetFace();
m_girlTrans.DOLocalMove(m_girlStartPos, 1.0f);
//m_girlTrans.DOLocalMove(m_girlStartPos, 1.0f);
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
m_boyTrans.gameObject.SetActive(true);
m_threeTrans.gameObject.SetActive(true);
m_boyNpcFace.SetFace();
m_boyTrans.DOLocalMove(m_girlStartPos, 1.0f);
//m_boyTrans.DOLocalMove(m_girlStartPos, 1.0f);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{
m_threeTrans.gameObject.SetActive(true);
m_fourTrans.gameObject.SetActive(true);
m_threeNpcFace.SetFace();
m_threeTrans.DOLocalMove(m_girlStartPos, 1.0f);
//m_threeTrans.DOLocalMove(m_girlStartPos, 1.0f);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{
m_fourTrans.gameObject.SetActive(true);
m_fiveTrans.gameObject.SetActive(true);
m_fourNpcFace.SetFace();
m_fourTrans.DOLocalMove(m_girlStartPos, 1.0f);
//m_fourTrans.DOLocalMove(m_girlStartPos, 1.0f);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
m_fiveTrans.gameObject.SetActive(true);
m_girlTrans.gameObject.SetActive(true);
m_fiveNpcFace.SetFace();
m_fiveTrans.DOLocalMove(m_girlStartPos, 1.0f);
//m_fiveTrans.DOLocalMove(m_girlStartPos, 1.0f);
}
BattleCtrl.instance.battleUI.OnBattleWin();
};
//BattleCtrl.instance.battleUI.OnBattleWin();
//};
}
//隐藏所有角色
void HideAllRole()
......
3D Fruit/Assets/#A2_Scripts/Services/GlobalConfig.cs
View file @ 7eaf4c59
......@@ -63,11 +63,14 @@ public class GlobalConfig
StrawberryRandomNum = Random.Range(5, 16);
LemonRandomNum = Random.Range(5, 16);
OrangeRandomNum = Random.Range(5, 16);
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex ||
BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex ||
BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{
ProgressFruitNumNeed = 10;
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex ||
BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
ProgressFruitNumNeed = 20;
}
......@@ -338,7 +341,7 @@ public class GlobalConfig
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
......@@ -503,7 +506,7 @@ public class GlobalConfig
float varZ = parent.localPosition.z;
for (int i = 0; i < num; i++)
{
int varRand = Random.Range(0, 8);
int varRand = Random.Range(0, 6);
GameObject varObj = null;
if (varRand >= 0 && varRand < 2)
{
......@@ -513,10 +516,10 @@ public class GlobalConfig
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
}
else if (varRand >= 4 && varRand < 6)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
}
//else if (varRand >= 4 && varRand < 6)
//{
// varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
//}
else
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.GlobeObj);
......@@ -832,15 +835,15 @@ public class GlobalConfig
varBody[i].isKinematic = value;
}
}
Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.VolleyBallObj);
if (varVolleyBall)
{
Rigidbody[] varBody = varVolleyBall.GetComponentsInChildren<Rigidbody>(true);
for (int i = 0; i < varBody.Length; i++)
{
varBody[i].isKinematic = value;
}
}
//Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.VolleyBallObj);
//if (varVolleyBall)
//{
// Rigidbody[] varBody = varVolleyBall.GetComponentsInChildren<Rigidbody>(true);
// for (int i = 0; i < varBody.Length; i++)
// {
// varBody[i].isKinematic = value;
// }
//}
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.GlobeObj);
if (varStone)
{
......@@ -899,7 +902,7 @@ public class GlobalConfig
}
}
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
Transform varFootBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.CubeObj);
if (varFootBall)
......@@ -1051,16 +1054,16 @@ public class GlobalConfig
}
varBasketBall.localPosition = Vector3.zero;
}
Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.VolleyBallObj);
if (varVolleyBall)
{
Rigidbody[] varBody = varVolleyBall.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varBody.Length; i++)
{
PoolManager.Instance.ReturnObjectToPool(varBody[i].gameObject);
}
varVolleyBall.localPosition = Vector3.zero;
}
//Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.VolleyBallObj);
//if (varVolleyBall)
//{
// Rigidbody[] varBody = varVolleyBall.GetComponentsInChildren<Rigidbody>();
// for (int i = 0; i < varBody.Length; i++)
// {
// PoolManager.Instance.ReturnObjectToPool(varBody[i].gameObject);
// }
// varVolleyBall.localPosition = Vector3.zero;
//}
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.GlobeObj);
if (varStone)
{
......@@ -1148,17 +1151,7 @@ public class GlobalConfig
}
varBasketBall.localPosition = Vector3.zero;
}
Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.VolleyBallObj);
if (varVolleyBall)
{
Rigidbody[] varBody = varVolleyBall.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varBody.Length; i++)
{
PoolManager.Instance.ReturnObjectToPool(varBody[i].gameObject);
}
varVolleyBall.localPosition = Vector3.zero;
}
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.StoneObj);
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.CubeObj);
if (varStone)
{
Rigidbody[] varBody = varStone.GetComponentsInChildren<Rigidbody>();
......@@ -1192,7 +1185,7 @@ public class GlobalConfig
{
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.FootBallObj, value);
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.BasketBallObj, value);
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.VolleyBallObj, value);
//PoolManager.Instance.SetActiveRootState(CacheManager.Instance.VolleyBallObj, value);
PoolManager.Instance.SetActiveRootState(CacheManager.Instance.GlobeObj, value);
}
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
......@@ -1271,11 +1264,11 @@ public class GlobalConfig
{
varBasketBall.SetParent(parent);
}
Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.VolleyBallObj);
if (varVolleyBall)
{
varVolleyBall.SetParent(parent);
}
//Transform varVolleyBall = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.VolleyBallObj);
//if (varVolleyBall)
//{
// varVolleyBall.SetParent(parent);
//}
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.GlobeObj);
if (varStone)
{
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 7eaf4c59
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A3_Prefabs/FruitPrefab/SmallCube.prefab
View file @ 7eaf4c59
......@@ -19,7 +19,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5034729393632334452
Transform:
m_ObjectHideFlags: 0
......@@ -27,11 +27,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 387977088452892543}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: 0, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1806410587666691091
......@@ -130,7 +130,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &8839220995527106594
Transform:
m_ObjectHideFlags: 0
......@@ -138,11 +138,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 606420291226098692}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: -0.01, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &214829601543385800
......@@ -222,6 +222,63 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &1196668687834475785
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 743107786369632170}
m_Layer: 12
m_Name: parent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &743107786369632170
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1196668687834475785}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 7, y: 7, z: 7}
m_Children:
- {fileID: 1627974873613910802}
- {fileID: 8394916502822216536}
- {fileID: 5976499065749007030}
- {fileID: 7263548201945193698}
- {fileID: 6826304650816390013}
- {fileID: 7819029834807875798}
- {fileID: 4071782514391232759}
- {fileID: 5074704684002650616}
- {fileID: 5796414288120403227}
- {fileID: 3722817836027262852}
- {fileID: 692001387792867423}
- {fileID: 6977277235213235615}
- {fileID: 4586677790576809478}
- {fileID: 6339061004149372247}
- {fileID: 9094538296125270108}
- {fileID: 9010315531867839586}
- {fileID: 3268419867303298004}
- {fileID: 6375680675454384568}
- {fileID: 7799361129665192825}
- {fileID: 8839220995527106594}
- {fileID: 1732631584515218336}
- {fileID: 2386929186882310573}
- {fileID: 604401103236412972}
- {fileID: 5034729393632334452}
- {fileID: 2469661008015098407}
- {fileID: 7852577201681005677}
- {fileID: 5873577921360200770}
m_Father: {fileID: 8609412451042633921}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1681867085942453041
GameObject:
m_ObjectHideFlags: 0
......@@ -249,13 +306,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1681867085942453041}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: -0.01, z: 0.01}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: -0.01, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!33 &8117809707365117201
MeshFilter:
m_ObjectHideFlags: 0
......@@ -352,7 +409,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5074704684002650616
Transform:
m_ObjectHideFlags: 0
......@@ -360,11 +417,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1812109068944169032}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: 0.01, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3172651408248006438
......@@ -471,11 +528,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1852345989312136767}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3063659199121509622
......@@ -574,7 +631,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5796414288120403227
Transform:
m_ObjectHideFlags: 0
......@@ -582,11 +639,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2369999433233452781}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: -0.01, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &668525018207881669
......@@ -685,7 +742,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2469661008015098407
Transform:
m_ObjectHideFlags: 0
......@@ -693,11 +750,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2444815600424511499}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: -0.01, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2163092823432814554
......@@ -804,13 +861,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2467532836367102280}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0.01, y: 0.01, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!33 &5269033199326507700
MeshFilter:
m_ObjectHideFlags: 0
......@@ -907,7 +964,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6977277235213235615
Transform:
m_ObjectHideFlags: 0
......@@ -915,11 +972,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2674525616862624891}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0.01, z: 0.01}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.01, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3611705119484395234
......@@ -1018,7 +1075,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5873577921360200770
Transform:
m_ObjectHideFlags: 0
......@@ -1026,11 +1083,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3265418009353116658}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: -0.01, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4137498020323497396
......@@ -1129,7 +1186,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &7263548201945193698
Transform:
m_ObjectHideFlags: 0
......@@ -1137,11 +1194,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4199585919228002661}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: 0.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3782549369784882621
......@@ -1240,7 +1297,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2386929186882310573
Transform:
m_ObjectHideFlags: 0
......@@ -1248,11 +1305,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4223567888433775332}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: 0, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2701047102715219840
......@@ -1357,35 +1414,9 @@ Transform:
m_GameObject: {fileID: 4693206948431944402}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 10, y: 10, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1627974873613910802}
- {fileID: 8394916502822216536}
- {fileID: 5976499065749007030}
- {fileID: 7263548201945193698}
- {fileID: 6826304650816390013}
- {fileID: 7819029834807875798}
- {fileID: 4071782514391232759}
- {fileID: 5074704684002650616}
- {fileID: 5796414288120403227}
- {fileID: 3722817836027262852}
- {fileID: 692001387792867423}
- {fileID: 6977277235213235615}
- {fileID: 4586677790576809478}
- {fileID: 6339061004149372247}
- {fileID: 9094538296125270108}
- {fileID: 9010315531867839586}
- {fileID: 3268419867303298004}
- {fileID: 6375680675454384568}
- {fileID: 7799361129665192825}
- {fileID: 8839220995527106594}
- {fileID: 1732631584515218336}
- {fileID: 2386929186882310573}
- {fileID: 604401103236412972}
- {fileID: 5034729393632334452}
- {fileID: 2469661008015098407}
- {fileID: 7852577201681005677}
- {fileID: 5873577921360200770}
- {fileID: 743107786369632170}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1408,7 +1439,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6339061004149372247
Transform:
m_ObjectHideFlags: 0
......@@ -1416,11 +1447,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5272210748414359353}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: 0.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6813750195258628759
......@@ -1519,7 +1550,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5976499065749007030
Transform:
m_ObjectHideFlags: 0
......@@ -1527,11 +1558,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5498531410447446582}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: -0.01, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5945756818771049905
......@@ -1630,7 +1661,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &7819029834807875798
Transform:
m_ObjectHideFlags: 0
......@@ -1638,11 +1669,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5595638744690215556}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: -0.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4569231455193384182
......@@ -1741,7 +1772,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &3722817836027262852
Transform:
m_ObjectHideFlags: 0
......@@ -1749,11 +1780,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6126566620063832326}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0.01, z: -0.01}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.01, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3364797066986379688
......@@ -1852,7 +1883,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &7852577201681005677
Transform:
m_ObjectHideFlags: 0
......@@ -1860,11 +1891,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6180920550237572919}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: -0.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2343464332735486512
......@@ -1971,11 +2002,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6352763135847728602}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.01, y: 0.01, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &252663887961833507
......@@ -2082,13 +2113,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6827577753549081912}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0.01, z: 0}
m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0}
--- !u!33 &7697169388194041961
MeshFilter:
m_ObjectHideFlags: 0
......@@ -2193,13 +2224,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7699366294822151261}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: -0.01, z: -0.01}
m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: -0.01, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
--- !u!33 &7550364542368980931
MeshFilter:
m_ObjectHideFlags: 0
......@@ -2296,7 +2327,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6375680675454384568
Transform:
m_ObjectHideFlags: 0
......@@ -2304,11 +2335,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8041481624147592429}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: -0.01}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1188989490416638927
......@@ -2415,13 +2446,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8088403456909523532}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0.01, y: 0, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!33 &3744200817967825646
MeshFilter:
m_ObjectHideFlags: 0
......@@ -2518,7 +2549,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &9010315531867839586
Transform:
m_ObjectHideFlags: 0
......@@ -2526,11 +2557,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8090152097647027416}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0.01}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3369914083675906795
......@@ -2637,13 +2668,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8100958229772232170}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
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: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
--- !u!33 &3690427521557594072
MeshFilter:
m_ObjectHideFlags: 0
......@@ -2748,13 +2779,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8250492665114197605}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0.01, y: 0.01, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &5831082634272322092
MeshFilter:
m_ObjectHideFlags: 0
......@@ -2851,7 +2882,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &8394916502822216536
Transform:
m_ObjectHideFlags: 0
......@@ -2859,11 +2890,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8352283051762852012}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: -7.245238e-11, z: 0.01}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: 0, z: 0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &9156139347110780347
......@@ -2962,7 +2993,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6826304650816390013
Transform:
m_ObjectHideFlags: 0
......@@ -2970,11 +3001,11 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8611800201022102504}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.01, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609412451042633921}
m_Father: {fileID: 743107786369632170}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6958895564512689506
......
3D Fruit/Assets/Res/Levels/SelectLevel.prefab
View file @ 7eaf4c59
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &947332506
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 947332507}
- component: {fileID: 947332510}
- component: {fileID: 947332509}
- component: {fileID: 947332508}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &947332507
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947332506}
m_LocalRotation: {x: -0.17982163, y: -0, z: -0, w: 0.98369926}
m_LocalPosition: {x: 0, y: 0.48768002, z: -0.3295}
m_LocalScale: {x: 1.5030785, y: 0.04615275, z: 0.12745169}
m_Children: []
m_Father: {fileID: 7476084885078772380}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -20.719002, y: 0, z: 0}
--- !u!33 &947332510
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947332506}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &947332509
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947332506}
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: b2d74df30b040034b8c77978acb891d1, 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!65 &947332508
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947332506}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &64939661163757316
GameObject:
m_ObjectHideFlags: 0
......@@ -5975,7 +6068,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013873104390231120}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 1.063, z: -0.25}
m_LocalPosition: {x: 0, y: 1.16, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7476084885803737205}
......@@ -10965,7 +11058,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1110049455340879462}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 1.063, z: -0.25}
m_LocalPosition: {x: 0, y: 1.16, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7476084885803737205}
......@@ -17624,7 +17717,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2969319863458919194}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 1.063, z: -0.25}
m_LocalPosition: {x: 0, y: 1.16, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7476084885803737205}
......@@ -25862,7 +25955,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398899573154023442}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 1.063, z: -0.25}
m_LocalPosition: {x: 0, y: 1.16, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7476084885803737205}
......@@ -31621,13 +31714,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7476084883839345431}
m_LocalRotation: {x: 0.62847483, y: -0.25533676, z: 0.042315006, w: 0.7335066}
m_LocalRotation: {x: 0.3940041, y: 0.15041436, z: -0.02551516, w: 0.9063582}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1407519428018055708}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 70.663, y: -76.082, z: -51.426003}
m_LocalEulerAnglesHint: {x: 46.211002, y: 21.405, z: 5.9950004}
--- !u!108 &7476084883839345430
Light:
m_ObjectHideFlags: 0
......@@ -31640,7 +31733,7 @@ Light:
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Intensity: 0.8
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
......@@ -31910,8 +32003,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7476084884500783503}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.262, z: -0.239}
m_LocalScale: {x: 1.5030785, y: 0.29012516, z: 0.1533022}
m_LocalPosition: {x: 0, y: 0.254, z: -0.239}
m_LocalScale: {x: 1.5030785, y: 0.4565975, z: 0.1533022}
m_Children: []
m_Father: {fileID: 7476084885078772380}
m_RootOrder: 0
......@@ -32098,6 +32191,8 @@ Transform:
m_Children:
- {fileID: 7476084884500783502}
- {fileID: 7476084885693177203}
- {fileID: 947332507}
- {fileID: 4812969008204152154}
m_Father: {fileID: 7476084883896529812}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -32315,8 +32410,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7476084885693177207}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.412, z: -0.239}
m_LocalScale: {x: 1.5030785, y: 0.04615275, z: 0.3049273}
m_LocalPosition: {x: 0, y: 0.499, z: -0.203}
m_LocalScale: {x: 1.5030785, y: 0.04615275, z: 0.1862764}
m_Children: []
m_Father: {fileID: 7476084885078772380}
m_RootOrder: 1
......@@ -32405,7 +32500,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7476084885803737206}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0.316}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8824734805718867547}
......@@ -37479,7 +37574,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8824734805718660503}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 1.063, z: -0.25}
m_LocalPosition: {x: 0, y: 1.16, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7476084885803737205}
......@@ -43443,6 +43538,126 @@ SkinnedMeshRenderer:
m_Center: {x: -0.14547417, y: 0.009123802, z: 0.00000067800283}
m_Extent: {x: 0.113866836, y: 0.108054556, z: 0.10941604}
m_DirtyAABB: 0
--- !u!1001 &554414575942981184
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7476084885078772380}
m_Modifications:
- target: {fileID: -6874540395504895234, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 20511a68abcb18342b7a5cddf8b9d641, type: 2}
- target: {fileID: -6874540395504895234, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: c6eeb9df215276c4580ad0a9ae88d511, type: 2}
- target: {fileID: -6874540395504895234, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_Materials.Array.data[2]
value:
objectReference: {fileID: 2100000, guid: c6eeb9df215276c4580ad0a9ae88d511, type: 2}
- target: {fileID: -6874540395504895234, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_Materials.Array.data[3]
value:
objectReference: {fileID: 2100000, guid: 87cb3191ba337fc4aaf9facf5e06e653, type: 2}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.264
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.508
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalScale.x
value: 0.06290567
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalScale.y
value: 0.06290567
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_LocalScale.z
value: 0.06290567
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_Name
value: Cup2_3
objectReference: {fileID: 0}
- target: {fileID: 2335950848445228762, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 702d2a7770d4e8549bbbe60e15e6f769, type: 2}
- target: {fileID: 6561579884561914704, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 64cd7c8aaef5ff84895ea843a98327fb, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ef0da07da6132c428e891f36503e977, type: 3}
--- !u!4 &4812969008204152154 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
type: 3}
m_PrefabInstance: {fileID: 554414575942981184}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7476084884037062835
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