|
|
@@ -99,7 +99,7 @@ namespace GFGGame
|
|
|
_ui.m_giftBtn.onClick.Add(OnClickBtnGift);
|
|
|
endValue = 1080;
|
|
|
duratio = 2.0f;
|
|
|
- WaitTime = 2600;
|
|
|
+ WaitTime = 2700;
|
|
|
AddEffect();
|
|
|
}
|
|
|
private void AddEffect()
|
|
|
@@ -116,7 +116,8 @@ namespace GFGGame
|
|
|
{
|
|
|
base.OnShown();
|
|
|
_ui.m_bg.url = ResPathUtil.GetBgImgPath("zqzp_bg");
|
|
|
- if(pointerList == null || pointerList.Count < 3)
|
|
|
+ pointerList.Clear();
|
|
|
+ if (pointerList == null || pointerList.Count < 3)
|
|
|
{
|
|
|
pointerList.Add(_ui.m_pointer0);
|
|
|
pointerList.Add(_ui.m_pointer1);
|
|
|
@@ -143,7 +144,7 @@ namespace GFGGame
|
|
|
_ui.m_btnStartOne.touchable = true;
|
|
|
_ui.m_btnStartThree.touchable = true;
|
|
|
_valueBarController.OnHide();
|
|
|
- pointerList.Clear();
|
|
|
+ //pointerList.Clear();
|
|
|
ActivityDataManager.Instance.threeTurnResult.Clear();
|
|
|
ActivityDataManager.Instance.TurnRewardList.Clear();
|
|
|
}
|
|
|
@@ -356,6 +357,9 @@ namespace GFGGame
|
|
|
wishType = 0;
|
|
|
_ui.m_btnStartOne.touchable = false;
|
|
|
_ui.m_btnStartThree.touchable = false;
|
|
|
+ _ui.m_btnBack.touchable = false;
|
|
|
+ _ui.m_valueBar.touchable = false;
|
|
|
+ _ui.m_shopBtn.touchable = false;
|
|
|
await TurnStart(0);
|
|
|
await Task.Delay(WaitTime);
|
|
|
BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(ActivityDataManager.Instance.TurnRewardList));
|
|
|
@@ -363,6 +367,9 @@ namespace GFGGame
|
|
|
UpdateReward();
|
|
|
_ui.m_btnStartOne.touchable = true;
|
|
|
_ui.m_btnStartThree.touchable = true;
|
|
|
+ _ui.m_btnBack.touchable = true;
|
|
|
+ _ui.m_valueBar.touchable = true;
|
|
|
+ _ui.m_shopBtn.touchable = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -401,6 +408,9 @@ namespace GFGGame
|
|
|
{
|
|
|
_ui.m_btnStartOne.touchable = false;
|
|
|
_ui.m_btnStartThree.touchable = false;
|
|
|
+ _ui.m_btnBack.touchable = false;
|
|
|
+ _ui.m_valueBar.touchable = false;
|
|
|
+ _ui.m_shopBtn.touchable = false;
|
|
|
await TurnStart(0);
|
|
|
await Task.Delay(WaitTime);
|
|
|
await TurnStart(1);
|
|
|
@@ -411,6 +421,9 @@ namespace GFGGame
|
|
|
ActivityDataManager.Instance.TurnRewardList.Clear();
|
|
|
_ui.m_btnStartOne.touchable = true;
|
|
|
_ui.m_btnStartThree.touchable = true;
|
|
|
+ _ui.m_btnBack.touchable = true;
|
|
|
+ _ui.m_valueBar.touchable = true;
|
|
|
+ _ui.m_shopBtn.touchable = true;
|
|
|
UpdateReward();
|
|
|
}
|
|
|
else
|
zhangyuqian