Commit d9543e33 authored by wanqing's avatar wanqing

增加排球

parent 4d5493f7
This diff is collapsed.
......@@ -145,14 +145,21 @@ public class FruitView : MonoBehaviour
{
varGo = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.SmallVolleyBallObj);
}
MeshRenderer[] varMesh = varGo.GetComponentsInChildren<MeshRenderer>();
for (int i = 0; i < varMesh.Length; i++)
else if(view.type == FruitType.Stone)
{
m_smallBallPosLst.Add(varMesh[i].transform.localPosition);
varGo = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.SmallStoneObj);
}
if(varGo)
{
MeshRenderer[] varMesh = varGo.GetComponentsInChildren<MeshRenderer>();
for (int i = 0; i < varMesh.Length; i++)
{
m_smallBallPosLst.Add(varMesh[i].transform.localPosition);
}
varGo.transform.position = view.transform.position;
varGo.transform.rotation = Quaternion.identity;
m_smallBallLst.Add(varGo);
}
varGo.transform.position = view.transform.position;
varGo.transform.rotation = Quaternion.identity;
m_smallBallLst.Add(varGo);
}
}
//小球回收
......@@ -474,6 +481,7 @@ public class FruitView : MonoBehaviour
int varFootBallNum = 0;
int varBasketBallNum = 0;
int varVolleyBallNum = 0;
int varStoneNum = 0;
for (int i = 0; i < m_selectLst.Count; i++)
{
if (m_selectLst[i].type == FruitType.Strawberry)
......@@ -500,6 +508,10 @@ public class FruitView : MonoBehaviour
{
varVolleyBallNum++;
}
else if (m_selectLst[i].type == FruitType.Stone)
{
varStoneNum++;
}
PoolManager.Instance.ReturnObjectToPool(m_selectLst[i].gameObject);
m_selectLst[i].ResetFragState();
//if (m_selectLst[i].transform.position.x < 0)
......@@ -528,7 +540,7 @@ public class FruitView : MonoBehaviour
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
if (varVolleyBallNum > 0)
if (varStoneNum > 0)
{
m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther = 1;
......@@ -566,7 +578,7 @@ public class FruitView : MonoBehaviour
//BattleCtrl.instance.battleUI.SetLemonNum(m_lemonTotalNum);
//BattleCtrl.instance.battleUI.SetOrangeNum(m_orangeTotalNum);
m_fruitTotalNum += varStrawberryNum + varLemonNum + varOrangeNum;
m_sportTotalNum += varFootBallNum + varBasketBallNum + varVolleyBallNum;
m_sportTotalNum += varFootBallNum + varBasketBallNum + varVolleyBallNum + varStoneNum;
//播放特效
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
......@@ -601,7 +613,7 @@ public class FruitView : MonoBehaviour
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
m_glassView.SetSportNum(varFootBallNum, varBasketBallNum, varVolleyBallNum);
m_glassView.SetSportNum(varFootBallNum, varBasketBallNum, varVolleyBallNum,varStoneNum);
}
}
}
......
......@@ -53,9 +53,9 @@ public class GlassView : MonoBehaviour
m_fruitView = BattleCtrl.instance.levelManager.curLevel.fruitView;
}
//运动类数量
public void SetSportNum(int num1, int num2, int num3)
public void SetSportNum(int num1, int num2, int num3,int num4)
{
m_sportNum += num1 + num2 + num3;
m_sportNum += num1 + num2 + num3 + num4;
BattleCtrl.instance.levelManager.curLevel.progressFruitNum = (int)m_sportNum;
if (m_sportNum >= GlobalConfig.ProgressFruitNumNeed)
{
......
......@@ -19,6 +19,8 @@ public class CacheManager : MonoBehaviour
[SerializeField]
private GameObject m_VolleyBallObj;//排球
[SerializeField]
private GameObject m_StoneObj;//石头
[SerializeField]
private GameObject m_StarwberryEffect1;//草莓爆汁特效1
[SerializeField]
private GameObject m_StarwberryEffect2;//草莓爆汁特效2
......@@ -45,6 +47,8 @@ public class CacheManager : MonoBehaviour
[SerializeField]
private GameObject m_SmallVolleyBallObj;//小排球
[SerializeField]
private GameObject m_SmallStoneObj;//小石头
[SerializeField]
private GameObject m_cmobo1EffectObj;//cmobo1
[SerializeField]
private GameObject m_cmobo2EffectObj;//cmobo2
......@@ -69,26 +73,6 @@ public class CacheManager : MonoBehaviour
[SerializeField]
private GameObject m_waterStarwberry1_9Obj;
[SerializeField]
private GameObject m_waterStarwberry2_1Obj;//水插件草莓2
[SerializeField]
private GameObject m_waterStarwberry2_2Obj;
[SerializeField]
private GameObject m_waterStarwberry2_3Obj;
[SerializeField]
private GameObject m_waterStarwberry2_4Obj;
[SerializeField]
private GameObject m_waterStarwberry2_5Obj;
[SerializeField]
private GameObject m_waterStarwberry3_1Obj;//水插件草莓3
[SerializeField]
private GameObject m_waterStarwberry3_2Obj;
[SerializeField]
private GameObject m_waterStarwberry3_3Obj;
[SerializeField]
private GameObject m_waterStarwberry3_4Obj;
[SerializeField]
private GameObject m_waterStarwberry3_5Obj;
[SerializeField]
private GameObject m_waterLemon1_1Obj;//水插件柠檬1
[SerializeField]
private GameObject m_waterLemon1_2Obj;
......@@ -107,26 +91,6 @@ public class CacheManager : MonoBehaviour
[SerializeField]
private GameObject m_waterLemon1_9Obj;
[SerializeField]
private GameObject m_waterLemon2_1Obj;//水插件柠檬2
[SerializeField]
private GameObject m_waterLemon2_2Obj;
[SerializeField]
private GameObject m_waterLemon2_3Obj;
[SerializeField]
private GameObject m_waterLemon2_4Obj;
[SerializeField]
private GameObject m_waterLemon2_5Obj;
[SerializeField]
private GameObject m_waterLemon3_1Obj;//水插件柠檬3
[SerializeField]
private GameObject m_waterLemon3_2Obj;
[SerializeField]
private GameObject m_waterLemon3_3Obj;
[SerializeField]
private GameObject m_waterLemon3_4Obj;
[SerializeField]
private GameObject m_waterLemon3_5Obj;
[SerializeField]
private GameObject m_waterOrange1_1Obj;//水插件橙子1
[SerializeField]
private GameObject m_waterOrange1_2Obj;
......@@ -144,26 +108,6 @@ public class CacheManager : MonoBehaviour
private GameObject m_waterOrange1_8Obj;
[SerializeField]
private GameObject m_waterOrange1_9Obj;
[SerializeField]
private GameObject m_waterOrange2_1Obj;//水插件橙子2
[SerializeField]
private GameObject m_waterOrange2_2Obj;
[SerializeField]
private GameObject m_waterOrange2_3Obj;
[SerializeField]
private GameObject m_waterOrange2_4Obj;
[SerializeField]
private GameObject m_waterOrange2_5Obj;
[SerializeField]
private GameObject m_waterOrange3_1Obj;//水插件橙子3
[SerializeField]
private GameObject m_waterOrange3_2Obj;
[SerializeField]
private GameObject m_waterOrange3_3Obj;
[SerializeField]
private GameObject m_waterOrange3_4Obj;
[SerializeField]
private GameObject m_waterOrange3_5Obj;
public GameObject lineObj => m_lineObj;
public GameObject LemonObj => m_LemonObj;
public GameObject OrangeObj => m_OrangeObj;
......@@ -171,6 +115,7 @@ public class CacheManager : MonoBehaviour
public GameObject FootBallObj => m_FootBallObj;
public GameObject BasketBallObj => m_BasketBallObj;
public GameObject VolleyBallObj => m_VolleyBallObj;
public GameObject StoneObj => m_StoneObj;
public GameObject StarwberryEffect1 => m_StarwberryEffect1;
public GameObject StarwberryEffect2 => m_StarwberryEffect2;
public GameObject LemonEffect1 => m_LemonEffect1;
......@@ -184,6 +129,7 @@ public class CacheManager : MonoBehaviour
public GameObject SmallBasketBallObj => m_SmallBasketBallObj;
public GameObject SmallFootBallObj => m_SmallFootBallObj;
public GameObject SmallVolleyBallObj => m_SmallVolleyBallObj;
public GameObject SmallStoneObj => m_SmallStoneObj;
public GameObject cmobo1EffectObj => m_cmobo1EffectObj;
public GameObject cmobo2EffectObj => m_cmobo2EffectObj;
public GameObject cmobo3EffectObj => m_cmobo3EffectObj;
......@@ -196,16 +142,6 @@ public class CacheManager : MonoBehaviour
public GameObject waterStarwberry1_7Obj => m_waterStarwberry1_7Obj;
public GameObject waterStarwberry1_8Obj => m_waterStarwberry1_8Obj;
public GameObject waterStarwberry1_9Obj => m_waterStarwberry1_9Obj;
public GameObject waterStarwberry2_1Obj => m_waterStarwberry2_1Obj;
public GameObject waterStarwberry2_2Obj => m_waterStarwberry2_2Obj;
public GameObject waterStarwberry2_3Obj => m_waterStarwberry2_3Obj;
public GameObject waterStarwberry2_4Obj => m_waterStarwberry2_4Obj;
public GameObject waterStarwberry2_5Obj => m_waterStarwberry2_5Obj;
public GameObject waterStarwberry3_1Obj => m_waterStarwberry3_1Obj;
public GameObject waterStarwberry3_2Obj => m_waterStarwberry3_2Obj;
public GameObject waterStarwberry3_3Obj => m_waterStarwberry3_3Obj;
public GameObject waterStarwberry3_4Obj => m_waterStarwberry3_4Obj;
public GameObject waterStarwberry3_5Obj => m_waterStarwberry3_5Obj;
public GameObject waterLemon1_1Obj => m_waterLemon1_1Obj;
public GameObject waterLemon1_2Obj => m_waterLemon1_2Obj;
public GameObject waterLemon1_3Obj => m_waterLemon1_3Obj;
......@@ -215,16 +151,6 @@ public class CacheManager : MonoBehaviour
public GameObject waterLemon1_7Obj => m_waterLemon1_7Obj;
public GameObject waterLemon1_8Obj => m_waterLemon1_8Obj;
public GameObject waterLemon1_9Obj => m_waterLemon1_9Obj;
public GameObject waterLemon2_1Obj => m_waterLemon2_1Obj;
public GameObject waterLemon2_2Obj => m_waterLemon2_2Obj;
public GameObject waterLemon2_3Obj => m_waterLemon2_3Obj;
public GameObject waterLemon2_4Obj => m_waterLemon2_4Obj;
public GameObject waterLemon2_5Obj => m_waterLemon2_5Obj;
public GameObject waterLemon3_1Obj => m_waterLemon3_1Obj;
public GameObject waterLemon3_2Obj => m_waterLemon3_2Obj;
public GameObject waterLemon3_3Obj => m_waterLemon3_3Obj;
public GameObject waterLemon3_4Obj => m_waterLemon3_4Obj;
public GameObject waterLemon3_5Obj => m_waterLemon3_5Obj;
public GameObject waterOrange1_1Obj => m_waterOrange1_1Obj;
public GameObject waterOrange1_2Obj => m_waterOrange1_2Obj;
public GameObject waterOrange1_3Obj => m_waterOrange1_3Obj;
......@@ -234,16 +160,6 @@ public class CacheManager : MonoBehaviour
public GameObject waterOrange1_7Obj => m_waterOrange1_7Obj;
public GameObject waterOrange1_8Obj => m_waterOrange1_8Obj;
public GameObject waterOrange1_9Obj => m_waterOrange1_9Obj;
public GameObject waterOrange2_1Obj => m_waterOrange2_1Obj;
public GameObject waterOrange2_2Obj => m_waterOrange2_2Obj;
public GameObject waterOrange2_3Obj => m_waterOrange2_3Obj;
public GameObject waterOrange2_4Obj => m_waterOrange2_4Obj;
public GameObject waterOrange2_5Obj => m_waterOrange2_5Obj;
public GameObject waterOrange3_1Obj => m_waterOrange3_1Obj;
public GameObject waterOrange3_2Obj => m_waterOrange3_2Obj;
public GameObject waterOrange3_3Obj => m_waterOrange3_3Obj;
public GameObject waterOrange3_4Obj => m_waterOrange3_4Obj;
public GameObject waterOrange3_5Obj => m_waterOrange3_5Obj;
public static CacheManager Instance = null;
void Awake()
{
......
......@@ -284,7 +284,7 @@ public class GlobalConfig
//}
//else
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
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);
......@@ -300,7 +300,7 @@ public class GlobalConfig
//}
//else
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
}
//varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ);
......@@ -355,20 +355,24 @@ public class GlobalConfig
float varZ = parent.localPosition.z;
for (int i = 0; i < num; i++)
{
int varRand = Random.Range(0, 6);
int varRand = Random.Range(0, 7);
GameObject varObj = null;
if (varRand >= 0 && varRand < 2)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
}
else if (varRand >= 2 && varRand < 5)
else if (varRand >= 2 && varRand < 4)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
}
else if (varRand >= 5 && varRand < 6)
else if (varRand >= 4 && varRand < 6)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
}
else if(varRand == 6)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StoneObj);
}
//else if (varRand == 6)
//{
// varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
......@@ -505,6 +509,23 @@ public class GlobalConfig
}
}
}
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.StoneObj);
if (varStone)
{
Rigidbody[] varBody = varStone.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varBody.Length; i++)
{
Transform varTrans = varBody[i].transform;
if (varBody[i].transform.position.x < 0)
{
varBody[i].AddForce((Vector3.up + Vector3.right) * 3.0f, ForceMode.Impulse);
}
else
{
varBody[i].AddForce((Vector3.left) * 3.0f, ForceMode.Impulse);
}
}
}
}
//设置水果刚体状态
public static void SetFruitRigidState(bool value)
......@@ -563,6 +584,15 @@ public class GlobalConfig
varBody[i].isKinematic = value;
}
}
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.StoneObj);
if (varStone)
{
Rigidbody[] varBody = varStone.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varBody.Length; i++)
{
varBody[i].isKinematic = value;
}
}
}
//缓存所有水果
public static void CacheAllFruit()
......@@ -621,6 +651,15 @@ public class GlobalConfig
PoolManager.Instance.ReturnObjectToPool(varBody[i].gameObject);
}
}
Transform varStone = PoolManager.Instance.GetObjectRoot(CacheManager.Instance.StoneObj);
if (varStone)
{
Rigidbody[] varBody = varStone.GetComponentsInChildren<Rigidbody>();
for (int i = 0; i < varBody.Length; i++)
{
PoolManager.Instance.ReturnObjectToPool(varBody[i].gameObject);
}
}
}
//隐藏所有水果
public static void SetActiveFruitState(bool value)
......@@ -631,6 +670,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.StoneObj, value);
}
}
......@@ -653,4 +693,5 @@ public enum FruitType
FootBall,
BasketBall,
VolleyBall,
Stone,
}
\ No newline at end of file
......@@ -19193,7 +19193,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8357422804284197225
RectTransform:
m_ObjectHideFlags: 0
......@@ -19210,7 +19210,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -480}
m_AnchoredPosition: {x: 0, y: -664}
m_SizeDelta: {x: 792, y: 446}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8357422804284197207
......
......@@ -124,7 +124,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ce0afadfd77b3b40bf16a06353f4b73, type: 3}
m_Name:
m_EditorClassIdentifier:
m_type: 7
m_type: 8
m_effect: {fileID: 3603993478180647943}
--- !u!64 &3617706319613521397
MeshCollider:
......
......@@ -32,7 +32,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children: []
m_Children:
- {fileID: 3287626112738879108}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -108,7 +109,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_type: 7
m_effect: {fileID: 0}
m_effect: {fileID: 3287626112739133964}
--- !u!54 &8164197497318543124
Rigidbody:
m_ObjectHideFlags: 0
......@@ -138,3 +139,92 @@ SphereCollider:
serializedVersion: 2
m_Radius: 0.10836897
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &3287626112739199490
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8252984608388568500}
m_Modifications:
- target: {fileID: 196622, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_Name
value: MagicSoftExplosionFire
objectReference: {fileID: 0}
- target: {fileID: 196622, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalScale.x
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalScale.y
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: m_LocalScale.z
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 19846136, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 34c006058d7d594449f3fb5c03a6d852, type: 3}
--- !u!1 &3287626112739133964 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 196622, guid: 34c006058d7d594449f3fb5c03a6d852,
type: 3}
m_PrefabInstance: {fileID: 3287626112739199490}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3287626112738879108 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 470150, guid: 34c006058d7d594449f3fb5c03a6d852,
type: 3}
m_PrefabInstance: {fileID: 3287626112739199490}
m_PrefabAsset: {fileID: 0}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment