Commit 9742ca65 authored by wanqing's avatar wanqing

修改界面

parent 2c86f21c
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &4
LightmapSettings:
......
......@@ -353,22 +353,18 @@ public class BattleUI : MonoBehaviour
// m_propSelectUi.gameObject.SetActive(true);
// BattleCtrl.instance.SelectPropState = true;
//}
ShowSelectUI();
}
//隐藏selectUI
public void HideSelectUI()
{
if (m_propSelectUi)
{
m_propSelectUi.Hide();
m_propSelectUi.Show();
}
}
//显示selectUI
public void ShowSelectUI()
//设置状态selectUI
public void SetSelectUIState(bool value)
{
if (m_propSelectUi)
{
m_propSelectUi.Show();
m_propSelectUi.SetState(value);
}
}
//设置战斗UI状态
......
......@@ -21,9 +21,9 @@ public class PropSelectUI : MonoBehaviour
m_doubleSymbolObj.SetActive(false);
m_coinSymbolObj.SetActive(false);
}
public void Hide()
public void SetState(bool value)
{
gameObject.SetActive(false);
gameObject.SetActive(value);
}
//点击加强
public void OnClickStrength()
......
......@@ -97,7 +97,7 @@ public class BombStateView : MonoBehaviour
void OverAniCB()
{
BattleCtrl.instance.battleUI.OnClickBoomBtn();
BattleCtrl.instance.battleUI.ShowSelectUI();
BattleCtrl.instance.battleUI.SetSelectUIState(true);
}
//开始爆破
public void StartBomb()
......
......@@ -270,7 +270,7 @@ public class BombView : MonoBehaviour
{
if (hit.collider.tag == "Target" && m_bCanBePlace)
{
BattleCtrl.instance.battleUI.HideSelectUI();
BattleCtrl.instance.battleUI.SetSelectUIState(false);
if (!m_bControlDoubleBomb)
{
GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj);
......
......@@ -3791,7 +3791,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.18823427, g: 0.7076902, b: 0.8867924, a: 1}
m_Color: {r: 0.18823427, g: 0.8862745, b: 0.29411766, a: 1}
m_RaycastTarget: 0
m_Maskable: 0
m_OnCullStateChanged:
......@@ -12564,7 +12564,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677632144689}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14433df62b9b3554e93abbfbc187fc8c, type: 3}
m_Name:
......@@ -12625,7 +12625,7 @@ Animator:
m_GameObject: {fileID: 6064464677660112694}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000, guid: bb389cc2efde9ef4ba6b88a34ad44400, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 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