Commit 4428029f authored by wanqing's avatar wanqing

修改脚本

parent 47da1462
...@@ -867,10 +867,10 @@ public class FruitView : MonoBehaviour ...@@ -867,10 +867,10 @@ public class FruitView : MonoBehaviour
//计算combo //计算combo
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex) if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{ {
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varFishNum + varEggNum;
if (varFishNum > 1 || varEggNum > 1) if (varFishNum > 1 || varEggNum > 1)
{ {
m_comboNum = 0; m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varFishNum + varEggNum;
//BattleCtrl.instance.battleUI.PlayCameraMistake(); //BattleCtrl.instance.battleUI.PlayCameraMistake();
} }
else else
...@@ -881,10 +881,10 @@ public class FruitView : MonoBehaviour ...@@ -881,10 +881,10 @@ public class FruitView : MonoBehaviour
} }
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex) else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{ {
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varOrangeNum;
if (varOrangeNum > 1) if (varOrangeNum > 1)
{ {
m_comboNum = 0; m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varOrangeNum;
} }
else else
{ {
...@@ -893,10 +893,10 @@ public class FruitView : MonoBehaviour ...@@ -893,10 +893,10 @@ public class FruitView : MonoBehaviour
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{ {
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varGlobeNum;
if (varGlobeNum > 1) if (varGlobeNum > 1)
{ {
m_comboNum = 0; m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varGlobeNum;
} }
else else
{ {
...@@ -905,10 +905,10 @@ public class FruitView : MonoBehaviour ...@@ -905,10 +905,10 @@ public class FruitView : MonoBehaviour
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{ {
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varCabbageNum + varOrangeNum;
if (varCabbageNum > 1 || varOrangeNum > 1) if (varCabbageNum > 1 || varOrangeNum > 1)
{ {
m_comboNum = 0; m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varCabbageNum + varOrangeNum;
} }
else else
{ {
...@@ -917,10 +917,10 @@ public class FruitView : MonoBehaviour ...@@ -917,10 +917,10 @@ public class FruitView : MonoBehaviour
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{ {
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varFootBallNum + varBasketBallNum;
if (varFootBallNum > 1 || varBasketBallNum > 1) if (varFootBallNum > 1 || varBasketBallNum > 1)
{ {
m_comboNum = 0; m_comboNum = 0;
BattleCtrl.instance.levelManager.curLevel.progressNoOther += varFootBallNum + varBasketBallNum;
} }
else else
{ {
......
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