|
@@ -86,7 +86,7 @@ namespace GFGGame
|
|
{
|
|
{
|
|
//if (MatchingOneDataManager.Instance.MathingDressDate.actionId != 0)
|
|
//if (MatchingOneDataManager.Instance.MathingDressDate.actionId != 0)
|
|
{
|
|
{
|
|
- _ui.m_bg.visible = false;
|
|
|
|
|
|
+ //_ui.m_bg.visible = false;
|
|
_ui.m_playerImage.visible = false;
|
|
_ui.m_playerImage.visible = false;
|
|
MatchingOneDataManager.Instance.itemGameObjs.Clear();
|
|
MatchingOneDataManager.Instance.itemGameObjs.Clear();
|
|
PhotographDataManager.Instance.itemGameObjs.Clear();
|
|
PhotographDataManager.Instance.itemGameObjs.Clear();
|
|
@@ -146,26 +146,25 @@ namespace GFGGame
|
|
{
|
|
{
|
|
_ui.m_countTime.fillAmount = 0;
|
|
_ui.m_countTime.fillAmount = 0;
|
|
_ui.m_countTime.visible = false;
|
|
_ui.m_countTime.visible = false;
|
|
- long endTime = MatchingCompetitionDataManager.Instance.MatchingEndTimes;
|
|
|
|
- long curTime = TimeHelper.ServerNow();
|
|
|
|
- if (endTime < curTime + 1)
|
|
|
|
- {
|
|
|
|
- if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
|
|
|
|
- {
|
|
|
|
- PromptController.Instance.ShowFloatTextPrompt("评选时间已到!");
|
|
|
|
- ViewManager.GoBackFrom(typeof(MatchingCompetitionUpLoadView).FullName);
|
|
|
|
- }
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
|
|
|
|
- if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
|
|
|
|
- {
|
|
|
|
- _ui.m_timeText.text = "评选剩余时间:" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- _ui.m_timeText.text = "结算剩余时间:" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
|
|
|
|
- }
|
|
|
|
|
|
+ //long endTime = MatchingCompetitionDataManager.Instance.MatchingEndTimes;
|
|
|
|
+ //long curTime = TimeHelper.ServerNow();
|
|
|
|
+ //if (endTime < curTime + 1)
|
|
|
|
+ //{
|
|
|
|
+ // if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
|
|
|
|
+ // {
|
|
|
|
+ // PromptController.Instance.ShowFloatTextPrompt("评选时间已到!");
|
|
|
|
+ // }
|
|
|
|
+ // return;
|
|
|
|
+ //}
|
|
|
|
+ //TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
|
|
|
|
+ //if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
|
|
|
|
+ //{
|
|
|
|
+ // _ui.m_timeText.text = "评选剩余时间:" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
|
|
|
|
+ //}
|
|
|
|
+ //else
|
|
|
|
+ //{
|
|
|
|
+ // _ui.m_timeText.text = "结算剩余时间:" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
|
|
|
|
+ //}
|
|
}
|
|
}
|
|
private void UpdateHead()
|
|
private void UpdateHead()
|
|
{
|
|
{
|