Commit 0dc1cde5 authored by wanqing's avatar wanqing

调试模式去掉continue和成绩显示,点击画面进入下一关

parent 3ec4f836
...@@ -217,7 +217,7 @@ MonoBehaviour: ...@@ -217,7 +217,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eac3ab1cd8d56dc4fb10ca3966649e25, type: 3} m_Script: {fileID: 11500000, guid: eac3ab1cd8d56dc4fb10ca3966649e25, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
battleUI: {fileID: 9106672011051914353} battleUI: {fileID: 6020807041659695165}
m_levelManager: {fileID: 186647396} m_levelManager: {fileID: 186647396}
--- !u!1 &1872965180 --- !u!1 &1872965180
GameObject: GameObject:
...@@ -263,8 +263,8 @@ MonoBehaviour: ...@@ -263,8 +263,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65d718b4fac224944ad7728793e3fdc7, type: 3} m_Script: {fileID: 11500000, guid: 65d718b4fac224944ad7728793e3fdc7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pad: {fileID: 9106672010263290414} pad: {fileID: 6020807040300631650}
joyStick: {fileID: 3046733044930327579} joyStick: {fileID: 551544052906070103}
--- !u!114 &1872965183 --- !u!114 &1872965183
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -277,7 +277,19 @@ MonoBehaviour: ...@@ -277,7 +277,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ff376a18ea419e546ba78667f1b5c6b3, type: 3} m_Script: {fileID: 11500000, guid: ff376a18ea419e546ba78667f1b5c6b3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1001 &551544051915097355 --- !u!114 &551544052906070103 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1259541852, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 1132880418365267536}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c26c7a0dcd8138d4194e0a4435a4740c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1132880418365267536
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
...@@ -396,23 +408,11 @@ PrefabInstance: ...@@ -396,23 +408,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
--- !u!114 &3046733044930327579 stripped --- !u!114 &6020807040300631650 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1259541852, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 551544051915097355}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c26c7a0dcd8138d4194e0a4435a4740c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &9106672010263290414 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458, m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458,
type: 3} type: 3}
m_PrefabInstance: {fileID: 551544051915097355} m_PrefabInstance: {fileID: 1132880418365267536}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
...@@ -420,11 +420,11 @@ MonoBehaviour: ...@@ -420,11 +420,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3} m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &9106672011051914353 stripped --- !u!114 &6020807041659695165 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458, m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
type: 3} type: 3}
m_PrefabInstance: {fileID: 551544051915097355} m_PrefabInstance: {fileID: 1132880418365267536}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
......
...@@ -31,6 +31,9 @@ public class BattleUI : MonoBehaviour ...@@ -31,6 +31,9 @@ public class BattleUI : MonoBehaviour
public Text m_clawMoveSpeed;//爪子移动速度 public Text m_clawMoveSpeed;//爪子移动速度
public Button m_settingBtn;//设置按钮 public Button m_settingBtn;//设置按钮
public GameObject m_settingPanel;//设置界面 public GameObject m_settingPanel;//设置界面
public GameObject m_successResultObj;//胜利结算obj
public GameObject m_successResultMaskObj;//胜利结算maskobj
public GameObject m_ShowOrHideMouseObj;//显示或隐藏手指图标obj
public Action onStartBtn; public Action onStartBtn;
public Action onPosUpBtn; public Action onPosUpBtn;
public Action onPosDownBtn; public Action onPosDownBtn;
...@@ -38,6 +41,9 @@ public class BattleUI : MonoBehaviour ...@@ -38,6 +41,9 @@ public class BattleUI : MonoBehaviour
public Action onFieldNearBtn; public Action onFieldNearBtn;
public Action onClawMoveSpeedAddBtn; public Action onClawMoveSpeedAddBtn;
public Action onClawMoveSpeedDownBtn; public Action onClawMoveSpeedDownBtn;
private Text m_ShowOrHideMouseText;//显示或隐藏手指text
private int m_mouseIndex = 0;
void Awake() void Awake()
{ {
m_dragBtn.onClick.AddListener(SetDragMode); m_dragBtn.onClick.AddListener(SetDragMode);
...@@ -52,6 +58,7 @@ public class BattleUI : MonoBehaviour ...@@ -52,6 +58,7 @@ public class BattleUI : MonoBehaviour
//m_posDownBtn.onClick.AddListener(PosDownBtn); //m_posDownBtn.onClick.AddListener(PosDownBtn);
//m_fieldFarBtn.onClick.AddListener(FieldFarBtn); //m_fieldFarBtn.onClick.AddListener(FieldFarBtn);
//m_fieldNearBtn.onClick.AddListener(FieldNearBtn); //m_fieldNearBtn.onClick.AddListener(FieldNearBtn);
m_ShowOrHideMouseText = m_ShowOrHideMouseObj.GetComponentInChildren<Text>();
GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm); GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
GameServices.configService.playerConfig.ClawMoveSpeed = 0.4f;//开始默认值 GameServices.configService.playerConfig.ClawMoveSpeed = 0.4f;//开始默认值
} }
...@@ -77,7 +84,7 @@ public class BattleUI : MonoBehaviour ...@@ -77,7 +84,7 @@ public class BattleUI : MonoBehaviour
BattleCtrl.instance.levelManager.LoadCurLevel(); BattleCtrl.instance.levelManager.LoadCurLevel();
} }
// 进入下一关卡 // 进入下一关卡
void NextLevel() public void NextLevel()
{ {
m_successObj.SetActive(false); m_successObj.SetActive(false);
BattleCtrl.instance.levelManager.LoadNextLevel(); BattleCtrl.instance.levelManager.LoadNextLevel();
...@@ -231,14 +238,24 @@ public class BattleUI : MonoBehaviour ...@@ -231,14 +238,24 @@ public class BattleUI : MonoBehaviour
public void SetBattleObjState(bool bool_) public void SetBattleObjState(bool bool_)
{ {
m_battleObj.SetActive(bool_); m_battleObj.SetActive(bool_);
m_successResultObj.SetActive(bool_);
m_successResultMaskObj.SetActive(!bool_);
//m_ShowOrHideMouseObj.SetActive(!bool_);
} }
//设置手势位置 //设置手势位置
public void SetMousePos(float x,float y) public void SetMousePos(float x,float y)
{ {
m_mouseObj.SetActive((x != 0 || y != 0) && !m_battleObj.activeSelf); m_mouseObj.SetActive((x != 0 || y != 0) && !m_battleObj.activeSelf && m_mouseIndex % 2 == 0);
Vector2 varVec2 = m_mouseObj.transform.localPosition; Vector2 varVec2 = m_mouseObj.transform.localPosition;
varVec2.x = x; varVec2.x = x;
varVec2.y = y; varVec2.y = y;
m_mouseObj.transform.localPosition = varVec2; m_mouseObj.transform.localPosition = varVec2;
} }
//显示或者隐藏手指图标
public void ShowOrHideMouseBtn()
{
m_ShowOrHideMouseObj.SetActive(false);
m_mouseIndex++;
m_ShowOrHideMouseText.text = m_mouseIndex % 2 != 0 ? "show" : "hide";
}
} }
This diff is collapsed.
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