Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BoomMaster
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanqing
BoomMaster
Commits
9742ca65
Commit
9742ca65
authored
Feb 09, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改界面
parent
2c86f21c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
17 deletions
+13
-17
DemoScenes.unity
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
+1
-1
BattleUI.cs
BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
+5
-9
PropSelectUI.cs
BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs
+2
-2
BombStateView.cs
BoomMaster/Assets/#A2_Scripts/Battle/View/BombStateView.cs
+1
-1
BombView.cs
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
+1
-1
BattleUI.prefab
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
+3
-3
No files found.
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
View file @
9742ca65
...
...
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
m_IndirectSpecularColor
:
{
r
:
0.373119
92
,
g
:
0.38074034
,
b
:
0.35872713
,
a
:
1
}
m_IndirectSpecularColor
:
{
r
:
0.373119
26
,
g
:
0.38073996
,
b
:
0.35872698
,
a
:
1
}
m_UseRadianceAmbientProbe
:
0
---
!u!157
&4
LightmapSettings
:
...
...
BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @
9742ca65
...
...
@@ -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
S
howSelectUI
(
)
//
设置状态
selectUI
public
void
S
etSelectUIState
(
bool
value
)
{
if
(
m_propSelectUi
)
{
m_propSelectUi
.
S
how
(
);
m_propSelectUi
.
S
etState
(
value
);
}
}
//设置战斗UI状态
...
...
BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs
View file @
9742ca65
...
...
@@ -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
(
fals
e
);
gameObject
.
SetActive
(
valu
e
);
}
//点击加强
public
void
OnClickStrength
()
...
...
BoomMaster/Assets/#A2_Scripts/Battle/View/BombStateView.cs
View file @
9742ca65
...
...
@@ -97,7 +97,7 @@ public class BombStateView : MonoBehaviour
void
OverAniCB
()
{
BattleCtrl
.
instance
.
battleUI
.
OnClickBoomBtn
();
BattleCtrl
.
instance
.
battleUI
.
S
howSelectUI
(
);
BattleCtrl
.
instance
.
battleUI
.
S
etSelectUIState
(
true
);
}
//开始爆破
public
void
StartBomb
()
...
...
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @
9742ca65
...
...
@@ -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
);
...
...
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @
9742ca65
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment