Skip to content

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

更换icon

parent 32398aa3
Hide whitespace changes
Inline Side-by-side
Showing with 120932 additions and 120896 deletions
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @ 37647745
This source diff could not be displayed because it is too large. You can view the blob instead.
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @ 37647745
......@@ -151,10 +151,10 @@ public class FruitView : MonoBehaviour
}
if(varGo)
{
MeshRenderer[] varMesh = varGo.GetComponentsInChildren<MeshRenderer>();
for (int i = 0; i < varMesh.Length; i++)
Rigidbody[] varRigid = varGo.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varRigid.Length; i++)
{
m_smallBallPosLst.Add(varMesh[i].transform.localPosition);
m_smallBallPosLst.Add(varRigid[i].transform.localPosition);
}
varGo.transform.position = view.transform.position;
varGo.transform.rotation = Quaternion.identity;
......@@ -170,10 +170,12 @@ public class FruitView : MonoBehaviour
for (int i = 0; i < m_smallBallLst.Count; i++)
{
PoolManager.Instance.ReturnObjectToPool(m_smallBallLst[i]);
MeshRenderer[] varMesh = m_smallBallLst[i].GetComponentsInChildren<MeshRenderer>();
for (int m = 0; m < varMesh.Length; m++)
Rigidbody[] varRigid = m_smallBallLst[i].GetComponentsInChildren<Rigidbody>();
for (int m = 0; m < varRigid.Length; m++)
{
varMesh[m].transform.localPosition = m_smallBallPosLst[m];
varRigid[m].transform.localPosition = m_smallBallPosLst[m];
varRigid[m].velocity = Vector3.zero;
varRigid[m].angularVelocity = Vector3.zero;
}
}
m_smallBallLst.Clear();
......@@ -289,9 +291,9 @@ public class FruitView : MonoBehaviour
//水果爆汁处理
void WaterFruit()
{
int varStrawberryNum = 0;
int varLemonNum = 0;
int varOrangeNum = 0;
//int varStrawberryNum = 0;
//int varLemonNum = 0;
//int varOrangeNum = 0;
for (int i = 0; i < m_selectLst.Count; i++)
{
Vector3 varVec = m_selectLst[i].transform.position;
......@@ -300,120 +302,123 @@ public class FruitView : MonoBehaviour
GameObject varWaterEffect = null;
if (m_selectLst[i].type == FruitType.Strawberry)
{
varStrawberryNum++;
if(varStrawberryNum == 1)
m_starwberryOneNum %= 9;
m_starwberryOneNum++;
if(m_starwberryOneNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_1Obj);
}
else if (varStrawberryNum == 2)
else if (m_starwberryOneNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_2Obj);
}
else if (varStrawberryNum == 3)
else if (m_starwberryOneNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_3Obj);
}
else if (varStrawberryNum == 4)
else if (m_starwberryOneNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_4Obj);
}
else if (varStrawberryNum == 5)
else if (m_starwberryOneNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_5Obj);
}
else if (varStrawberryNum == 6)
else if (m_starwberryOneNum == 6)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_6Obj);
}
else if (varStrawberryNum == 7)
else if (m_starwberryOneNum == 7)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_7Obj);
}
else if (varStrawberryNum == 8)
else if (m_starwberryOneNum == 8)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_8Obj);
}
else if (varStrawberryNum == 9)
else if (m_starwberryOneNum == 9)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1_9Obj);
}
}
else if(m_selectLst[i].type == FruitType.Lemon)
{
varLemonNum++;
if (varLemonNum == 1)
m_lemonOneNum %= 9;
m_lemonOneNum++;
if (m_lemonOneNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_1Obj);
}
else if (varLemonNum == 2)
else if (m_lemonOneNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_2Obj);
}
else if (varLemonNum == 3)
else if (m_lemonOneNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_3Obj);
}
else if (varLemonNum == 4)
else if (m_lemonOneNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_4Obj);
}
else if (varLemonNum == 5)
else if (m_lemonOneNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_5Obj);
}
else if (varLemonNum == 6)
else if (m_lemonOneNum == 6)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_6Obj);
}
else if (varLemonNum == 7)
else if (m_lemonOneNum == 7)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_7Obj);
}
else if (varLemonNum == 8)
else if (m_lemonOneNum == 8)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_8Obj);
}
else if (varLemonNum == 9)
else if (m_lemonOneNum == 9)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1_9Obj);
}
}
else if (m_selectLst[i].type == FruitType.Orange)
{
varOrangeNum++;
if (varOrangeNum == 1)
m_orangeOneNum %= 9;
m_orangeOneNum++;
if (m_orangeOneNum == 1)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_1Obj);
}
else if (varOrangeNum == 2)
else if (m_orangeOneNum == 2)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_2Obj);
}
else if (varOrangeNum == 3)
else if (m_orangeOneNum == 3)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_3Obj);
}
else if (varOrangeNum == 4)
else if (m_orangeOneNum == 4)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_4Obj);
}
else if (varOrangeNum == 5)
else if (m_orangeOneNum == 5)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_5Obj);
}
else if (varOrangeNum == 6)
else if (m_orangeOneNum == 6)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_6Obj);
}
else if (varOrangeNum == 7)
else if (m_orangeOneNum == 7)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_7Obj);
}
else if (varOrangeNum == 8)
else if (m_orangeOneNum == 8)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_8Obj);
}
else if (varOrangeNum == 9)
else if (m_orangeOneNum == 9)
{
varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1_9Obj);
}
......@@ -609,11 +614,13 @@ public class FruitView : MonoBehaviour
GameServices.timerServices.Push(this, 0.8f, delegate
{
m_glassView.SetFruitNum(varStrawberryNum, varLemonNum, varOrangeNum);
BattleCtrl.instance.levelManager.curLevel.CalculateStar();
});
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
m_glassView.SetSportNum(varFootBallNum, varBasketBallNum, varVolleyBallNum,varStoneNum);
BattleCtrl.instance.levelManager.curLevel.CalculateStar();
}
}
}
......@@ -1218,20 +1225,20 @@ public class FruitView : MonoBehaviour
if (!m_selectLst.Contains(varHitTrans))
{
m_bIsTouchUp = false;
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
if (BattleCtrl.instance.isFirstLevelTop)
{
BattleCtrl.instance.OnBattleFail();
}
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
if (BattleCtrl.instance.isWin)
{
BattleCtrl.instance.OnBattleFail();
}
}
//if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
//{
// if (BattleCtrl.instance.isFirstLevelTop)
// {
// BattleCtrl.instance.OnBattleFail();
// }
//}
//else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
//{
// if (BattleCtrl.instance.isWin)
// {
// BattleCtrl.instance.OnBattleFail();
// }
//}
GlobalConfig.SetFruitRigidState(true);
m_highLightEffect.enabled = false;
m_highLightEffect.enabled = true;
......
3D Fruit/Assets/#A2_Scripts/Services/GlobalConfig.cs
View file @ 37647745
......@@ -231,7 +231,7 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
}
//varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
......@@ -247,6 +247,18 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
}
//varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
......@@ -287,7 +299,7 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
}
//varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
......@@ -303,6 +315,18 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
}
//varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
......
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 37647745
......@@ -1245,7 +1245,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3afc2b4c334b2134897b4ea3997bc013, type: 3}
m_Sprite: {fileID: 21300000, guid: 14c5a3a3ccce523459a47a03bb1734fe, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -11718,7 +11718,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3eada229472b6054abf9a399699efe04, type: 3}
m_Sprite: {fileID: 21300000, guid: c5a907af424db2f44bffe2a7ad5ef797, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @ 37647745
......@@ -36882,6 +36882,11 @@ PrefabInstance:
propertyPath: m_Name
value: SM_Primitive_Torus_04
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: eeac5b70c5baae8478ec17be74426a76,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: eeac5b70c5baae8478ec17be74426a76, type: 3}
--- !u!1 &1514226244696436991 stripped
......
3D Fruit/ProjectSettings/ProjectSettings.asset
View file @ 37647745
......@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: Dyspace
productName: Blent it Match
productName: Blend it match
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
......@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.Dyspace.BlentitMatch
Android: com.Dyspace.Blenditmatch
buildNumber: {}
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 19
......
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