Commit c86dec3e authored by wanqing's avatar wanqing

调试模式

parent 0cc24f9a
This diff is collapsed.
...@@ -1079,35 +1079,35 @@ public class FruitView : MonoBehaviour ...@@ -1079,35 +1079,35 @@ public class FruitView : MonoBehaviour
{ {
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex) if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{ {
if(m_firstTotalNum <= GlobalConfig.TotalValidNum) //if(m_firstTotalNum <= GlobalConfig.TotalValidNum)
{ {
GlobalConfig.LoadFirstRandomFruit(m_SelectNum, m_fruitParent); GlobalConfig.LoadFirstRandomFruit(m_SelectNum, m_fruitParent);
} }
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{ {
if(m_secondTotalNum <= GlobalConfig.TotalValidNum) //if(m_secondTotalNum <= GlobalConfig.TotalValidNum)
{ {
GlobalConfig.LoadSecondRandomFruit(m_SelectNum, m_fruitParent); GlobalConfig.LoadSecondRandomFruit(m_SelectNum, m_fruitParent);
} }
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
{ {
if (m_thirdTotalNum <= GlobalConfig.TotalValidNum) //if (m_thirdTotalNum <= GlobalConfig.TotalValidNum)
{ {
GlobalConfig.LoadThirdRandomFruit(m_SelectNum, m_fruitParent); GlobalConfig.LoadThirdRandomFruit(m_SelectNum, m_fruitParent);
} }
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
{ {
if (m_fourthTotalNum <= GlobalConfig.TotalValidNum) //if (m_fourthTotalNum <= GlobalConfig.TotalValidNum)
{ {
GlobalConfig.LoadFourthRandomFruit(m_SelectNum, m_fruitParent); GlobalConfig.LoadFourthRandomFruit(m_SelectNum, m_fruitParent);
} }
} }
else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{ {
if (m_fifthTotalNum <= GlobalConfig.TotalValidNum) //if (m_fifthTotalNum <= GlobalConfig.TotalValidNum)
{ {
GlobalConfig.LoadFifthRandomFruit(m_SelectNum, m_fruitParent); GlobalConfig.LoadFifthRandomFruit(m_SelectNum, m_fruitParent);
} }
...@@ -1406,8 +1406,8 @@ public class FruitView : MonoBehaviour ...@@ -1406,8 +1406,8 @@ public class FruitView : MonoBehaviour
{ {
if (hit.collider && hit.collider.gameObject.CompareTag("Target")) if (hit.collider && hit.collider.gameObject.CompareTag("Target"))
{ {
float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth); float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth) -100.0f;
float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth); float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth) - 100.0f;
BattleCtrl.instance.battleUI.SetKnifePos(varX, varY); BattleCtrl.instance.battleUI.SetKnifePos(varX, varY);
FruitItemView varHitTrans = hit.collider.transform.GetComponent<FruitItemView>(); FruitItemView varHitTrans = hit.collider.transform.GetComponent<FruitItemView>();
if (!m_selectLst.Contains(varHitTrans)) if (!m_selectLst.Contains(varHitTrans))
......
...@@ -16981,7 +16981,7 @@ MonoBehaviour: ...@@ -16981,7 +16981,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677632144689} m_GameObject: {fileID: 6064464677632144689}
m_Enabled: 0 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14433df62b9b3554e93abbfbc187fc8c, type: 3} m_Script: {fileID: 11500000, guid: 14433df62b9b3554e93abbfbc187fc8c, type: 3}
m_Name: m_Name:
......
fileFormatVersion: 2
guid: 8d9282ce6b301ca4d95cbb2eb703cfef
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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