Commit b4bc4615 authored by wanqing's avatar wanqing

修改代码

parent 9284d0cb
...@@ -109,6 +109,7 @@ public class BattleUI : MonoBehaviour ...@@ -109,6 +109,7 @@ public class BattleUI : MonoBehaviour
public bool bfadeState => m_bfadeState; public bool bfadeState => m_bfadeState;
private bool m_bLoadSceneFinish = false;//场景是否加载完成 private bool m_bLoadSceneFinish = false;//场景是否加载完成
private int m_startIndex = 0;//点击开始次数 private int m_startIndex = 0;//点击开始次数
private int m_startClickNum = 0;
private GameObject m_cameraRenderObj; private GameObject m_cameraRenderObj;
private float m_resultStartPosY; private float m_resultStartPosY;
public bool bBackWaterEffect {get; private set; }//回收水特效 public bool bBackWaterEffect {get; private set; }//回收水特效
...@@ -223,6 +224,8 @@ public class BattleUI : MonoBehaviour ...@@ -223,6 +224,8 @@ public class BattleUI : MonoBehaviour
m_bfadeState = false; m_bfadeState = false;
m_startIndex %= 5; m_startIndex %= 5;
m_startIndex++; m_startIndex++;
m_startClickNum %= 999;
m_startClickNum++;
} }
//设置 //设置
void SettingBtn() void SettingBtn()
...@@ -358,29 +361,30 @@ public class BattleUI : MonoBehaviour ...@@ -358,29 +361,30 @@ public class BattleUI : MonoBehaviour
m_selectLevelObj.SetActive(false); m_selectLevelObj.SetActive(false);
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex) if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{ {
m_starLevel.text = "LEVEL 1"; //m_starLevel.text = "LEVEL 1";
m_fruitNeedDesText.text = string.Format("Fruit x {0:d}", GlobalConfig.ProgressFruitNumNeed); m_fruitNeedDesText.text = string.Format("Fruit x {0:d}", GlobalConfig.ProgressFruitNumNeed);
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{ {
m_starLevel.text = "LEVEL 2"; //m_starLevel.text = "LEVEL 2";
m_fruitNeedDesText.text = string.Format("Vegitable x {0:d}", GlobalConfig.ProgressFruitNumNeed); m_fruitNeedDesText.text = string.Format("Vegetables x {0:d}", GlobalConfig.ProgressFruitNumNeed);
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{ {
m_starLevel.text = "LEVEL 3"; //m_starLevel.text = "LEVEL 3";
m_fruitNeedDesText.text = string.Format("Ball x {0:d}", GlobalConfig.ProgressFruitNumNeed); m_fruitNeedDesText.text = string.Format("Ball x {0:d}", GlobalConfig.ProgressFruitNumNeed);
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{ {
m_starLevel.text = "LEVEL 4"; //m_starLevel.text = "LEVEL 4";
m_fruitNeedDesText.text = string.Format("JunkFood x {0:d}", GlobalConfig.ProgressFruitNumNeed); m_fruitNeedDesText.text = string.Format("JunkFood x {0:d}", GlobalConfig.ProgressFruitNumNeed);
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{ {
m_starLevel.text = "LEVEL 5"; //m_starLevel.text = "LEVEL 5";
m_fruitNeedDesText.text = string.Format("Cube x {0:d}", GlobalConfig.ProgressFruitNumNeed); m_fruitNeedDesText.text = string.Format("Cube x {0:d}", GlobalConfig.ProgressFruitNumNeed);
} }
m_starLevel.text = string.Format("LEVEL {0:d}", m_startClickNum);
int varComboPro = BattleCtrl.instance.levelManager.curLevel.progressCombo; int varComboPro = BattleCtrl.instance.levelManager.curLevel.progressCombo;
int varFruitNumPro = BattleCtrl.instance.levelManager.curLevel.progressFruitNum; int varFruitNumPro = BattleCtrl.instance.levelManager.curLevel.progressFruitNum;
int varNoOtherPro = BattleCtrl.instance.levelManager.curLevel.progressNoOther; int varNoOtherPro = BattleCtrl.instance.levelManager.curLevel.progressNoOther;
...@@ -498,7 +502,7 @@ public class BattleUI : MonoBehaviour ...@@ -498,7 +502,7 @@ public class BattleUI : MonoBehaviour
} }
m_boomBtn.interactable = false; m_boomBtn.interactable = false;
m_levelText.text = string.Format("Level {0:D}", BattleCtrl.instance.levelManager.CurLevelIndex + 1); m_levelText.text = string.Format("Level {0:D}", m_startClickNum/*BattleCtrl.instance.levelManager.CurLevelIndex + 1*/);
//Camera varCam = BattleCtrl.instance.levelManager.curLevel.cam; //Camera varCam = BattleCtrl.instance.levelManager.curLevel.cam;
//if (varCam) //if (varCam)
...@@ -529,7 +533,7 @@ public class BattleUI : MonoBehaviour ...@@ -529,7 +533,7 @@ public class BattleUI : MonoBehaviour
//varPos.y = -286.0f; //varPos.y = -286.0f;
m_fruitSecondLineObj.SetActive(true); m_fruitSecondLineObj.SetActive(true);
m_sportIconObj.SetActive(true); m_sportIconObj.SetActive(true);
m_needIconNum.text = "Vegitable"; m_needIconNum.text = "Vegetables";
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{ {
......
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