|
@@ -243,12 +243,9 @@ namespace GFGGame
|
|
|
comBox.m_btnRule.onClick.Add(RuleController.ShowRuleView);
|
|
|
comBox.m_btnRule.data = 300024;
|
|
|
}
|
|
|
- comBox.m_btnRule.visible = true;
|
|
|
}
|
|
|
- else {
|
|
|
+ else
|
|
|
comBox.m_showActivityType.selectedIndex = 0;
|
|
|
- comBox.m_btnRule.visible = false;
|
|
|
- }
|
|
|
|
|
|
if (!_lcukyBoxCtrl.ContainsKey(boxId))
|
|
|
{
|
|
@@ -492,7 +489,6 @@ namespace GFGGame
|
|
|
int boxId = (int)obj.data;
|
|
|
LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
|
|
|
long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
|
|
|
-
|
|
|
int boughtCount = GameGlobal.myNumericComponent.GetAsInt(luckyBoxCfg.numericType);
|
|
|
|
|
|
if (boughtCount + LuckyBoxDataManager.ONCE_TIME > luckyBoxCfg.maxCount)
|
|
@@ -506,12 +502,8 @@ namespace GFGGame
|
|
|
if (boxId == LuckyBoxDataManager.BOX_ID_2) {
|
|
|
activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
|
|
|
}
|
|
|
- bool result = false;
|
|
|
- if (freeTime > 0 && freeTime < TimeHelper.ServerNow())
|
|
|
- result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME, true, activityId);
|
|
|
- else
|
|
|
- result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME,false, activityId);
|
|
|
-
|
|
|
+ bool freeType = (freeTime > 0 && freeTime < TimeHelper.ServerNow());
|
|
|
+ bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME, freeType, activityId);
|
|
|
if (result)
|
|
|
{
|
|
|
ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });
|