From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Guild/GuildHawkerWin.cs | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/Main/System/Guild/GuildHawkerWin.cs b/Main/System/Guild/GuildHawkerWin.cs
index b7410ce..b6cc1ff 100644
--- a/Main/System/Guild/GuildHawkerWin.cs
+++ b/Main/System/Guild/GuildHawkerWin.cs
@@ -1,7 +1,9 @@
-锘縰sing System.Collections.Generic;
+锘縰sing System;
+using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
+using Cysharp.Threading.Tasks;
public class GuildHawkerWin : UIBase
{
@@ -17,7 +19,7 @@
[SerializeField] Button cutBtn;
[SerializeField] Text cutText;
[SerializeField] Text timeText;
-
+ [SerializeField] UIHeroController heroController;
@@ -26,7 +28,7 @@
memberOnlineBtn.AddListener(() =>
{
- UIManager.Instance.OpenWindow<GuildHawkerNoCutWin>();
+ UIManager.Instance.OpenWindowAsync<GuildHawkerNoCutWin>().Forget();
});
cutBtn.AddListener(OnCut);
@@ -38,8 +40,16 @@
scroller.OnRefreshCell += OnRefreshCell;
GuildManager.Instance.UpdateZhenbaogeEvent += OnPlayerZBGEvent;
GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
-
- Display();
+ GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
+
+ try
+ {
+ Display();
+ }
+ catch (Exception e)
+ {
+ Debug.LogError(e);
+ }
CreateScroller();
}
@@ -55,13 +65,21 @@
scroller.OnRefreshCell -= OnRefreshCell;
GuildManager.Instance.UpdateZhenbaogeEvent -= OnPlayerZBGEvent;
GlobalTimeEvent.Instance.secondEvent -= OnSecondEvent;
+ GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
}
void OnSecondEvent()
{
- timeText.text = Language.Get("Guild_74", TimeUtility.SecondsToShortDHMS((int)(TimeUtility.GetTodayEndTime() - TimeUtility.ServerNow).TotalSeconds));
+ timeText.text = Language.Get("Guild_74", TimeUtility.SecondsToShortDHMS((int)(TimeUtility.GetCommTodayEndTime(GuildManager.Instance.zoneID) -
+ TimeUtility.GetCommServerNow(GuildManager.Instance.zoneID)).TotalSeconds));
}
+ int index = 0;
+ void OnFiveSecondEvent()
+ {
+ index++;
+ heroController.PlayAnimation(index % 2 == 0 ? "idle" : "hanhua", true);
+ }
void OnRefreshCell(ScrollerDataType type, CellView cell)
{
var _cell = cell as GuildHawkerCutCell;
@@ -190,10 +208,10 @@
void OnCut()
{
- //閫�鐩熺殑cd闄愬埗
- if (GuildManager.Instance.needCheckCutCD && (TimeUtility.AllSeconds - PlayerDatas.Instance.baseData.leaveFamilyTime) / 60 < GuildManager.Instance.zbgChangFamilyCD )
+ //鐮嶄环鐨刢d闄愬埗: 鍏細娌℃湁璁板綍鑷繁鐮嶈繃浠凤紝浣嗕粖澶╂湁鐮嶄环璁板綍锛屼笖閫�鍑鸿繃鍏細
+ if (GuildManager.Instance.zhenbaogeCutState == 0 && GuildManager.Instance.needCheckCutCD && (TimeUtility.GetCommServerTick(GuildManager.Instance.zoneID) - PlayerDatas.Instance.baseData.leaveFamilyTime) / 60 < GuildManager.Instance.zbgChangFamilyCD )
{
- SysNotifyMgr.Instance.ShowTip("ZhenbaogeCut1", GuildManager.Instance.zbgChangFamilyCD - (TimeUtility.AllSeconds - PlayerDatas.Instance.baseData.leaveFamilyTime) / 60);
+ SysNotifyMgr.Instance.ShowTip("ZhenbaogeCut1", GuildManager.Instance.zbgChangFamilyCD - (TimeUtility.GetCommServerTick(GuildManager.Instance.zoneID) - PlayerDatas.Instance.baseData.leaveFamilyTime) / 60);
return;
}
if (GuildManager.Instance.zhenbaogeCutState == 0)
@@ -208,9 +226,10 @@
return;
}
- if (GuildManager.Instance.familyZBGActions[1].Value3 == 0 && UIHelper.GetMoneyCnt(GuildManager.Instance.zbgPriceType) < GuildManager.Instance.familyZBGActions[1].Value2)
+ if (GuildManager.Instance.familyZBGActions[1].Value3 == 0 &&
+ !UIHelper.CheckMoneyCount(GuildManager.Instance.zbgPriceType, GuildManager.Instance.familyZBGActions[1].Value2, 2))
{
- SysNotifyMgr.Instance.ShowTip("LackMoney", GuildManager.Instance.zbgPriceType);
+ // SysNotifyMgr.Instance.ShowTip("LackMoney", GuildManager.Instance.zbgPriceType);
return;
}
@@ -227,7 +246,7 @@
ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
- Language.Get("L1135", GuildManager.Instance.zbgPriceType, cutPrice)+ Language.Get("Guild_71"), (bool isOK) =>
+ Language.Get("L1135", UIHelper.GetIconNameWithMoneyType(GuildManager.Instance.zbgPriceType), cutPrice)+ Language.Get("Guild_71"), (bool isOK) =>
{
if (isOK)
{
--
Gitblit v1.8.0