Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
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
1081c6c6
Commit
1081c6c6
authored
Feb 09, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
装了炸弹界面消失,爆破结束出现界面
parent
9163f632
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
7 deletions
+36
-7
.suo
BoomMaster/.vs/BoomMaster/v16/.suo
+0
-0
BattleUI.cs
BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
+14
-1
PropSelectUI.cs
BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs
+5
-0
BombStateView.cs
BoomMaster/Assets/#A2_Scripts/Battle/View/BombStateView.cs
+10
-4
BombView.cs
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
+6
-1
BattleUI.prefab
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
+1
-1
No files found.
BoomMaster/.vs/BoomMaster/v16/.suo
View file @
1081c6c6
No preview for this file type
BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @
1081c6c6
...
@@ -353,7 +353,20 @@ public class BattleUI : MonoBehaviour
...
@@ -353,7 +353,20 @@ public class BattleUI : MonoBehaviour
// m_propSelectUi.gameObject.SetActive(true);
// m_propSelectUi.gameObject.SetActive(true);
// BattleCtrl.instance.SelectPropState = true;
// BattleCtrl.instance.SelectPropState = true;
//}
//}
if
(
m_propSelectUi
)
ShowSelectUI
();
}
//隐藏selectUI
public
void
HideSelectUI
()
{
if
(
m_propSelectUi
)
{
m_propSelectUi
.
Hide
();
}
}
//显示selectUI
public
void
ShowSelectUI
()
{
if
(
m_propSelectUi
)
{
{
m_propSelectUi
.
Show
();
m_propSelectUi
.
Show
();
}
}
...
...
BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs
View file @
1081c6c6
...
@@ -12,6 +12,7 @@ public class PropSelectUI : MonoBehaviour
...
@@ -12,6 +12,7 @@ public class PropSelectUI : MonoBehaviour
public
GameObject
m_coinSymbolObj
;
public
GameObject
m_coinSymbolObj
;
public
void
Show
()
public
void
Show
()
{
{
gameObject
.
SetActive
(
true
);
int
varCoin
=
LocalRecord
.
GetIntRecord
(
GlobalConfig
.
CoinReCordKey
);
int
varCoin
=
LocalRecord
.
GetIntRecord
(
GlobalConfig
.
CoinReCordKey
);
m_strengthObj
.
SetActive
(
varCoin
>=
10
);
m_strengthObj
.
SetActive
(
varCoin
>=
10
);
m_doubleObj
.
SetActive
(
varCoin
>=
20
);
m_doubleObj
.
SetActive
(
varCoin
>=
20
);
...
@@ -20,6 +21,10 @@ public class PropSelectUI : MonoBehaviour
...
@@ -20,6 +21,10 @@ public class PropSelectUI : MonoBehaviour
m_doubleSymbolObj
.
SetActive
(
false
);
m_doubleSymbolObj
.
SetActive
(
false
);
m_coinSymbolObj
.
SetActive
(
false
);
m_coinSymbolObj
.
SetActive
(
false
);
}
}
public
void
Hide
()
{
gameObject
.
SetActive
(
false
);
}
//点击加强
//点击加强
public
void
OnClickStrength
()
public
void
OnClickStrength
()
{
{
...
...
BoomMaster/Assets/#A2_Scripts/Battle/View/BombStateView.cs
View file @
1081c6c6
...
@@ -50,7 +50,7 @@ public class BombStateView : MonoBehaviour
...
@@ -50,7 +50,7 @@ public class BombStateView : MonoBehaviour
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Join
(
m_strengthUnrealParent
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Join
(
m_strengthUnrealParent
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
AppendCallback
(
delegate
()
{
BattleCtrl
.
instance
.
battleUI
.
OnClickBoomBtn
();
}
);
m_sqFirst
.
AppendCallback
(
OverAniCB
);
}
}
else
else
...
@@ -60,7 +60,7 @@ public class BombStateView : MonoBehaviour
...
@@ -60,7 +60,7 @@ public class BombStateView : MonoBehaviour
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
1.2f
,
0.5f
));
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
1.2f
,
0.5f
));
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
0.25f
,
0.25f
));
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
0.25f
,
0.25f
));
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Append
(
m_strengthRealBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
AppendCallback
(
delegate
()
{
BattleCtrl
.
instance
.
battleUI
.
OnClickBoomBtn
();
}
);
m_sqFirst
.
AppendCallback
(
OverAniCB
);
}
}
}
}
else
else
...
@@ -80,7 +80,7 @@ public class BombStateView : MonoBehaviour
...
@@ -80,7 +80,7 @@ public class BombStateView : MonoBehaviour
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Join
(
m_unrealParent
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Join
(
m_unrealParent
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
AppendCallback
(
delegate
()
{
BattleCtrl
.
instance
.
battleUI
.
OnClickBoomBtn
();
}
);
m_sqFirst
.
AppendCallback
(
OverAniCB
);
}
}
else
else
{
{
...
@@ -89,10 +89,16 @@ public class BombStateView : MonoBehaviour
...
@@ -89,10 +89,16 @@ public class BombStateView : MonoBehaviour
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
1.2f
,
0.5f
));
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
1.2f
,
0.5f
));
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
0.25f
,
0.25f
));
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
0.25f
,
0.25f
));
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
Append
(
m_realBombObj
.
transform
.
DOScale
(
Vector3
.
one
*
2.0f
,
0.25f
));
m_sqFirst
.
AppendCallback
(
delegate
()
{
BattleCtrl
.
instance
.
battleUI
.
OnClickBoomBtn
();
}
);
m_sqFirst
.
AppendCallback
(
OverAniCB
);
}
}
}
}
}
}
//动画播放结束回调
void
OverAniCB
()
{
BattleCtrl
.
instance
.
battleUI
.
OnClickBoomBtn
();
BattleCtrl
.
instance
.
battleUI
.
ShowSelectUI
();
}
//开始爆破
//开始爆破
public
void
StartBomb
()
public
void
StartBomb
()
{
{
...
...
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @
1081c6c6
...
@@ -270,7 +270,8 @@ public class BombView : MonoBehaviour
...
@@ -270,7 +270,8 @@ public class BombView : MonoBehaviour
{
{
if
(
hit
.
collider
.
tag
==
"Target"
&&
m_bCanBePlace
)
if
(
hit
.
collider
.
tag
==
"Target"
&&
m_bCanBePlace
)
{
{
if
(!
m_bControlDoubleBomb
)
BattleCtrl
.
instance
.
battleUI
.
HideSelectUI
();
if
(!
m_bControlDoubleBomb
)
{
{
GameObject
go
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
rayfireBombObj
);
GameObject
go
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
rayfireBombObj
);
//go.transform.position = hit.point;
//go.transform.position = hit.point;
...
@@ -335,6 +336,10 @@ public class BombView : MonoBehaviour
...
@@ -335,6 +336,10 @@ public class BombView : MonoBehaviour
m_recordSecondBombPos
=
hit
.
point
;
m_recordSecondBombPos
=
hit
.
point
;
Invoke
(
"TimeLimitStartBomb"
,
5.0f
);
Invoke
(
"TimeLimitStartBomb"
,
5.0f
);
}
}
else
{
RandomCreateAnotherBomb
();
}
}
}
else
else
{
{
...
...
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @
1081c6c6
...
@@ -5051,7 +5051,7 @@ RectTransform:
...
@@ -5051,7 +5051,7 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
1
,
y
:
0
}
m_AnchorMin
:
{
x
:
1
,
y
:
0
}
m_AnchorMax
:
{
x
:
1
,
y
:
0
}
m_AnchorMax
:
{
x
:
1
,
y
:
0
}
m_AnchoredPosition
:
{
x
:
-22
7.1
,
y
:
75
}
m_AnchoredPosition
:
{
x
:
-22
5.2
,
y
:
75
}
m_SizeDelta
:
{
x
:
65
,
y
:
65
}
m_SizeDelta
:
{
x
:
65
,
y
:
65
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&6929955050858487627
---
!u!222
&6929955050858487627
...
...
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