Core/NetworkPackage/DTCFile/ServerPack/HB9_Team/DTCB912_tagGCTeamMemFuncDataList.cs
@@ -20,6 +20,7 @@ { if (vNetData.TeamMemFuncType == 0) { main.IsSend = true; main.LayerNumber = 7; for (int i = 0; i < vNetData.MemCount; i++) { Core/SDK/SDKUtility.cs
@@ -24,7 +24,7 @@ Js = 4,// 极速 } public E_ChannelPlatform ChannelPlatform { get; private set; } public E_ChannelPlatform ChannelPlatform { get; set; } /// <summary> /// sdk初始化是否完成标识 System/Chat/ChatData.cs
@@ -3,6 +3,7 @@ using System.Text.RegularExpressions; using UnityEngine; using Snxxz.UI; using System; public class ChatData { @@ -15,6 +16,7 @@ } richText = new StringBuilder(); richText.Length = 0; createTime = DateTime.Now; } private string _content = string.Empty; @@ -37,6 +39,8 @@ public ChatInfoType type { get; protected set; } public DateTime createTime { get; private set; } private ChatInfoType m_DetailType = ChatInfoType.World; public ChatInfoType detailType { System/Chat/ChatMineVoiceCell.cs
@@ -14,6 +14,7 @@ [SerializeField] Image m_ChatBubble; [SerializeField] Text vipText; [SerializeField] Text playerNameText; [SerializeField] Text m_ChatTime; [SerializeField] Image m_ChatIcon; [SerializeField] ImageFitterText m_Fitter; @@ -50,6 +51,7 @@ m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(_data.job, 0)); playerNameText.text = _data.name; m_ChatTime.text = _data.createTime.ToString("yyyy-MM-dd HH:mm"); if (_data.vipLv > 0) { vipText.text = string.Format("V{0}", _data.vipLv); System/Chat/ChatOtherVoiceCell.cs
@@ -14,6 +14,7 @@ [SerializeField] Image m_ChatBubble; [SerializeField] Text vipText; [SerializeField] Text playerNameText; [SerializeField] Text m_ChatTime; [SerializeField] Image m_ChatIcon; [SerializeField] ImageFitterText m_Fitter; [SerializeField] Button m_ViewPlayer; @@ -42,6 +43,7 @@ m_Fitter.gameObject.SetActive(!string.IsNullOrEmpty(_data.content)); m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(_data.job, 0)); playerNameText.text = _data.name; m_ChatTime.text = _data.createTime.ToString("yyyy-MM-dd HH:mm"); if (_data.vipLv > 0) { vipText.text = string.Format("V{0}", _data.vipLv); System/Chat/ChatPlayerMineCell.cs
@@ -7,11 +7,13 @@ { public class ChatPlayerMineCell : ScrollerUI { [SerializeField] Image chatIcon; [SerializeField] Text vipText; [SerializeField] Text playerNameText; [SerializeField] RichText chatText; [SerializeField] Image m_ChatIcon; [SerializeField] Text m_VipLv; [SerializeField] Text m_PlayerName; [SerializeField] Text m_ChatTime; [SerializeField] RichText m_Chat; [SerializeField] ImageFitterText m_Fitter; [SerializeField] Button m_Func; ChatCenter m_ChatCenter; ChatCenter chatCenter @@ -23,47 +25,50 @@ } public override void Refresh(CellView cell) { ChatData _data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, cell.index); if (_data == null) ChatData data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, cell.index); if (data == null) { return; } } var chatUserData = data as ChatUeseData; #region 更新高度 chatText.AutoNewLine = false; chatText.text = _data.content; m_Chat.AutoNewLine = false; m_Chat.text = data.content; if (type == ScrollerDataType.Header) { if (chatText.preferredWidth > chatText.rectTransform.rect.width) if (m_Chat.preferredWidth > m_Chat.rectTransform.rect.width) { chatText.alignment = TextAnchor.UpperLeft; m_Chat.alignment = TextAnchor.UpperLeft; } else { chatText.alignment = TextAnchor.UpperRight; m_Chat.alignment = TextAnchor.UpperRight; } m_Fitter.FiterRealTxtWidth = chatText.alignment == TextAnchor.UpperRight; m_Fitter.FiterRealTxtWidth = m_Chat.alignment == TextAnchor.UpperRight; } chatText.AutoNewLine = true; chatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait((_data as ChatUeseData).job, 0)); m_Chat.AutoNewLine = true; m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(chatUserData.job, 0)); #endregion Button headBtn = chatIcon.GetComponent<Button>(); headBtn.onClick.RemoveAllListeners(); headBtn.onClick.AddListener(() => m_Func.onClick.RemoveAllListeners(); m_Func.onClick.AddListener(() => { OnHeadIconClick(cell); OnFunc(cell); }); playerNameText.text = (_data as ChatUeseData).name; if ((_data as ChatUeseData).vipLv > 0) m_PlayerName.text = chatUserData.name; m_ChatTime.text = data.createTime.ToString("yyyy-MM-dd HH:mm"); if (chatUserData.vipLv > 0) { vipText.text = string.Format("V{0}", (_data as ChatUeseData).vipLv); m_VipLv.text = string.Format("V{0}", chatUserData.vipLv); } else { vipText.text = string.Empty; m_VipLv.text = string.Empty; } } private void OnHeadIconClick(CellView cell) private void OnFunc(CellView cell) { int index = cell.index; ChatData _data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, index); @@ -72,7 +77,10 @@ return; } ChatUeseData user = _data as ChatUeseData; if (user.player == PlayerDatas.Instance.baseData.PlayerID) return; if (user.player == PlayerDatas.Instance.baseData.PlayerID) { return; } HrefAnalysis.Inst.ExcuteHrefEvent(string.Format("showplayer={0}", user.player)); } } System/Chat/ChatPlayerOtherCell.cs
@@ -8,11 +8,13 @@ public class ChatPlayerOtherCell : ScrollerUI { [SerializeField] Image chatIcon; [SerializeField] Text vipText; [SerializeField] Text playerNameText; [SerializeField] RectTransform bubbleRt; [SerializeField] RichText chatText; [SerializeField] Image m_ChatIcon; [SerializeField] Text m_VipLv; [SerializeField] Text m_PlayerName; [SerializeField] Text m_ChatTime; [SerializeField] RectTransform m_Bottom; [SerializeField] RichText m_Chat; [SerializeField] Button m_Func; ChatCenter m_ChatCenter; ChatCenter chatCenter @@ -24,45 +26,48 @@ } public override void Refresh(CellView cell) { ChatData _data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, cell.index); if (_data == null) var data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, cell.index); if (data == null) { return; } #region 更新高度 if (type == ScrollerDataType.Header) { if (chatText.preferredWidth > chatText.rectTransform.rect.width) if (m_Chat.preferredWidth > m_Chat.rectTransform.rect.width) { chatText.alignment = TextAnchor.UpperLeft; m_Chat.alignment = TextAnchor.UpperLeft; } else { chatText.alignment = TextAnchor.UpperRight; m_Chat.alignment = TextAnchor.UpperRight; } } #endregion Button headBtn = chatIcon.GetComponent<Button>(); headBtn.onClick.RemoveAllListeners(); headBtn.onClick.AddListener(() => var chatUserData = data as ChatUeseData; m_Func.onClick.RemoveAllListeners(); m_Func.onClick.AddListener(() => { OnHeadIconClick(cell); OnFunc(cell); }); chatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait((_data as ChatUeseData).job, 0)); playerNameText.text = (_data as ChatUeseData).name; if ((_data as ChatUeseData).vipLv > 0) m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(chatUserData.job, 0)); m_PlayerName.text = chatUserData.name; m_ChatTime.text = data.createTime.ToString("yyyy-MM-dd HH:mm"); if (chatUserData.vipLv > 0) { vipText.text = string.Format("V{0}", (_data as ChatUeseData).vipLv); m_VipLv.text = string.Format("V{0}", chatUserData.vipLv); } else { vipText.text = string.Empty; m_VipLv.text = string.Empty; } chatText.AutoNewLine = true; chatText.text = _data.content; m_Chat.AutoNewLine = true; m_Chat.text = data.content; } private void OnHeadIconClick(CellView cell) private void OnFunc(CellView cell) { int index = cell.index; ChatData _data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, index); @@ -71,7 +76,10 @@ return; } ChatUeseData user = _data as ChatUeseData; if (user.player == PlayerDatas.Instance.baseData.PlayerID) return; if (user.player == PlayerDatas.Instance.baseData.PlayerID) { return; } HrefAnalysis.Inst.ExcuteHrefEvent(string.Format("showplayer={0}", user.player)); } } System/Chat/ChatTip.cs
@@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Text; using UnityEngine; using UnityEngine.UI; public class ChatTip : MonoBehaviour @@ -50,6 +51,8 @@ private List<GameObject> chatItems = new List<GameObject>(ChatCtrl.CHAT_TIP_CNT); static StringBuilder sb = new StringBuilder(); void InitCom() { chatBg = this.GetComponent<Image>("Image"); @@ -77,7 +80,8 @@ private bool OnGetDynamicSize(ScrollerDataType type, int index, out float height) { destText.SetExtenalData(chatUpDataList[index].infoList); destText.text = SetChatExtraInfo(chatUpDataList[index]) + chatUpDataList[index].content; destText.text = StringUtility.Contact(SetChatExtraInfo(chatUpDataList[index]), chatUpDataList[index].content); height = destText.preferredHeight; return true; } @@ -93,7 +97,8 @@ { text.SetExtenalData(chatUpDataList[index].infoList); } text.text = SetChatExtraInfo(chatUpDataList[index]) + chatUpDataList[index].content; text.text = StringUtility.Contact(SetChatExtraInfo(chatUpDataList[index]), chatUpDataList[index].content); text.OnClick = () => { OnChatDataClick(data); @@ -252,34 +257,87 @@ string SetChatExtraInfo(ChatData data) { sb.Length = 0; string vipLv = string.Empty; string chatIcon = string.Empty; string chatName = string.Empty; var chatUserData = (data as ChatUeseData); switch (data.type) { case ChatInfoType.World: { return string.Format("<Img chat={0}/> <color=#109d06>{1}</color>: ", "ChatIcon_World", (data as ChatUeseData).name); chatIcon = "ChatIcon_World"; chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = StringUtility.Contact("V", chatUserData.vipLv); } break; } case ChatInfoType.Area: return string.Format("<Img chat={0}/> <color=#109d06>{1}</color>: ", "ChatIcon_Area", (data as ChatUeseData).name); { chatIcon = "ChatIcon_Area"; chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = StringUtility.Contact("V", chatUserData.vipLv); } break; } case ChatInfoType.Team: { string playerName = (data as ChatUeseData).name; return string.Format("<Img chat={0}/> <color=#109d06>{1}</color>", "ChatIcon_Team", playerName + (playerName != string.Empty ? ": " : string.Empty)); chatIcon = "ChatIcon_Team"; chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = StringUtility.Contact("V", chatUserData.vipLv); } break; } case ChatInfoType.Friend: break; case ChatInfoType.Fairy: { string playerName = (data as ChatUeseData).name; return string.Format("<Img chat={0}/> <color=#109d06>{1}</color>", "ChatIcon_Fairy", playerName + (playerName != string.Empty ? ": " : string.Empty)); chatIcon = "ChatIcon_Fairy"; chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = StringUtility.Contact("V", chatUserData.vipLv); } break; } case ChatInfoType.Trumpet: return string.Format("<Img chat={0}/> <color=#109d06>{1}</color>: ", "ChatIcon_Trumpet", (data as ChatTrumpetData).name); { chatIcon = "ChatIcon_Trumpet"; chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = StringUtility.Contact("V", chatUserData.vipLv); } break; } case ChatInfoType.Invite: return string.Format("<Img chat={0}/> ", "ChatIcon_Invite"); { chatIcon = "ChatIcon_Invite"; break; } case ChatInfoType.System: return string.Format("<Img chat={0}/> ", "ChatIcon_System"); { chatIcon = "ChatIcon_System"; break; } } return string.Empty; if (!string.IsNullOrEmpty(chatIcon)) { sb.Append(string.Format("<Img chat={0}/> ", chatIcon)); } if (!string.IsNullOrEmpty(vipLv)) { sb.Append(string.Format("<color=#f8983b>{0}</color> ", vipLv)); } if (!string.IsNullOrEmpty(chatName)) { sb.Append(string.Format("<color=#109d06>{0}</color>: ", chatName)); } return sb.ToString(); } private void OnDisable() System/Debug/DebugLogin.cs
@@ -11,36 +11,41 @@ public InputField serverId; public InputField account; public InputField password; public InputField platform; public Toggle isToken; string appidRecorder { string appidRecorder { get { return LocalSave.GetString("DebugLogin_AppId"); } set { LocalSave.SetString("DebugLogin_AppId", value); } } string serverIdRecorder { string serverIdRecorder { get { return LocalSave.GetString("DebugLogin_ServerId"); } set { LocalSave.SetString("DebugLogin_ServerId", value); } } string accountRecorder { string accountRecorder { get { return LocalSave.GetString("DebugLogin_Account"); } set { LocalSave.SetString("DebugLogin_Account", value); } } string passwordRecorder { string passwordRecorder { get { return LocalSave.GetString("DebugLogin_Password"); } set { LocalSave.SetString("DebugLogin_Password", value); } } bool istokenRecorder { int platformRecorder { get { return LocalSave.GetInt("DebugLoging_Platform", 1); } set { LocalSave.SetInt("DebugLoging_Platform", value); } } bool istokenRecorder { get { return LocalSave.GetBool("DebugLogin_IsToken", false); } set { LocalSave.SetBool("DebugLogin_IsToken", value); } } @@ -51,6 +56,7 @@ serverId.text = serverIdRecorder; account.text = accountRecorder; password.text = passwordRecorder; platform.text = platformRecorder.ToString(); isToken.isOn = istokenRecorder; } @@ -60,6 +66,9 @@ serverIdRecorder = serverId.text; accountRecorder = account.text; passwordRecorder = password.text; var platformTemp = 0; int.TryParse(platform.text, out platformTemp); platformRecorder = platformTemp; istokenRecorder = isToken.isOn; if (!string.IsNullOrEmpty(appid.text)) @@ -67,6 +76,8 @@ VersionConfig.Get().m_AppId = appid.text; } SDKUtility.Instance.ChannelPlatform = (SDKUtility.E_ChannelPlatform)int.Parse(platform.text); if (isToken.isOn) { var loginModel = ModelCenter.Instance.GetModel<LoginModel>(); System/Dungeon/DungeonModel.cs
@@ -531,6 +531,7 @@ { var cB910 = new CB910_tagCGQueryTeamMemFuncData(); cB910.TeamMemFuncType = 0; mainModel.IsSend = false; GameNetSystem.Instance.SendInfo(cB910); } else @@ -570,6 +571,7 @@ { mainModel.LayerNumber = 0; } mainModel.IsSend = true; } SnxxzGame.Instance.StartCoroutine(AwaitTime()); } @@ -577,6 +579,11 @@ IEnumerator AwaitTime() { yield return WaitingForSecondConst.WaitMS700; var mainModel = ModelCenter.Instance.GetModel<PlayerMainDate>(); if (!mainModel.IsSend) { yield break; } WindowCenter.Instance.Open<FloorChooseWin>(); }
@@ -70,6 +70,7 @@ } } public int LayerNumberNow = 0;//现在的选择层数 public bool IsSend = false;//像服务端法宝请求回包保护 //-------------用来控住主界面的Tip的执行调用 public bool IsTipBool = true;
@@ -1,6 +1,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; using TableConfig; namespace Snxxz.UI { @@ -8,7 +9,7 @@ { [SerializeField] CommonItemBaisc itemBaisc; [SerializeField] GameObject bestIconObj; [SerializeField] Text nameText; ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } WishingPoolModel wishingModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } } int index = -1; @@ -24,6 +25,9 @@ this.index = index; WishingPoolModel.WishingWellItem wellItem = null; bool isPoolData = wishingModel.TryGetPoolDataByIndex(index,out wellItem); ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(wellItem.itemId); nameText.text = itemConfig.ItemName; nameText.color = UIHelper.GetUIColor(itemConfig.ItemColor); bestIconObj.SetActive(false); ItemCellModel cellModel = new ItemCellModel(wellItem.itemId,false,(ulong)wellItem.itemCount,wellItem.isBind); itemBaisc.Init(cellModel); System/OpenServerActivity/WishGroupCell.cs
@@ -2,6 +2,7 @@ using UnityEngine; using UnityEngine.UI; using System; using TableConfig; using System.Collections.Generic; namespace Snxxz.UI @@ -26,6 +27,9 @@ { poolItem.Object.SetActive(true); var info = items[i]; ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(info.itemId); poolItem.nameText.text = itemConfig.ItemName; poolItem.nameText.color = UIHelper.GetUIColor(itemConfig.ItemColor); ItemCellModel cellModel = new ItemCellModel(info.itemId,true,(ulong)info.itemCount,info.isBind); poolItem.itemBaisc.Init(cellModel); if(i == 0) @@ -57,6 +61,7 @@ public GameObject Object; public CommonItemBaisc itemBaisc; public GameObject bestImg; public Text nameText; } } } System/OpenServerActivity/WishItemCell.cs
New file @@ -0,0 +1,44 @@ using UnityEngine; using UnityEngine.UI; using TableConfig; namespace Snxxz.UI { public class WishItemCell : MonoBehaviour { [SerializeField] CommonItemBaisc itemBaisc; [SerializeField] GameObject noneItemObj; [SerializeField] Button noneItemBtn; [SerializeField] Text nameText; ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } WishingPoolModel wishingModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } } public void Display(int index) { WishingPoolModel.WishingWellItem wellItem = null; bool isWishData = wishingModel.TryGetWishDataByIndex(index, out wellItem); if (isWishData) { nameText.gameObject.SetActive(true); itemBaisc.gameObject.SetActive(true); noneItemObj.gameObject.SetActive(false); ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(wellItem.itemId); nameText.text = itemConfig.ItemName; nameText.color = UIHelper.GetUIColor(itemConfig.ItemColor); ItemCellModel cellModel = new ItemCellModel(wellItem.itemId, false, (ulong)wellItem.itemCount, wellItem.isBind); itemBaisc.Init(cellModel); itemBaisc.cellBtn.RemoveAllListeners(); itemBaisc.cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(wellItem.itemId, true, (ulong)wellItem.itemCount, -1, wellItem.isBind); tipsModel.SetItemTipsModel(attrData); }); } else { itemBaisc.gameObject.SetActive(false); noneItemObj.gameObject.SetActive(true); nameText.gameObject.SetActive(false); } } } } System/OpenServerActivity/WishItemCell.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: c37d2addeecee1b4d91b72098f044169 timeCreated: 1540260925 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/OpenServerActivity/WishingPoolModel.cs
@@ -120,6 +120,8 @@ return false; } #region 本地数据 public bool isDraging { get; set; } public int dragIndex { get; set; } System/OpenServerActivity/WishingPoolWin.cs
@@ -10,11 +10,14 @@ [SerializeField] DragItem dragItem; [SerializeField] Text activityDayText; [SerializeField] Text totalDayText; [SerializeField] Text dayRemainTime; [SerializeField] Button lookAllBtn; [SerializeField] Button refreshWishBtn; [SerializeField] Button freeRefreshWishBtn; [SerializeField] Button moneyRefreshWishBtn; [SerializeField] Text moneyValueText; [SerializeField] Text freeWishCoolText; [SerializeField] List<PoolItemCell> poolItemCells = new List<PoolItemCell>(); [SerializeField] List<WishingCell> wishingCells = new List<WishingCell>(); [SerializeField] List<WishItemCell> wishingCells = new List<WishItemCell>(); [SerializeField] GameObject activityOpenObj; [SerializeField] GameObject activityCloseObj; @@ -29,17 +32,18 @@ protected override void AddListeners() { refreshWishBtn.AddListener(ClickRefreshWish); freeRefreshWishBtn.AddListener(ClickFreeRefreshWish); moneyRefreshWishBtn.AddListener(ClickMoneyRefreshWish); lookAllBtn.AddListener(ClickLook); } protected override void OnPreOpen() { Display(); OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent; wishingModel.UpdatePoolDataEvent += UpdatePoolItemByIndex; wishingModel.UpdateWishingDataEvent += UpdateWishItemByIndex; GlobalTimeEvent.Instance.hourEvent += UpdateFreeWishCool; Display(); GlobalTimeEvent.Instance.secondEvent += UpdateSecond; } protected override void OnAfterOpen() @@ -50,10 +54,9 @@ { wishingModel.UpdatePoolDataEvent -= UpdatePoolItemByIndex; wishingModel.UpdateWishingDataEvent -= UpdateWishItemByIndex; GlobalTimeEvent.Instance.hourEvent -= UpdateFreeWishCool; GlobalTimeEvent.Instance.secondEvent -= UpdateSecond; OperationTimeHepler.Instance.operationEndEvent -= OperationEndEvent; } protected override void OnAfterClose() { @@ -73,8 +76,9 @@ dragItem.dragItemRect.gameObject.SetActive(false); UpdateFreeWishCool(); UpdateActivityState(); activityDayText.text = Language.Get("SignIn_4", Language.Get(StringUtility.Contact("Num_CHS_", operation.GetActivityDay()))); totalDayText.text = StringUtility.Contact("活动持续", Language.Get(StringUtility.Contact("Num_CHS_",operation.totalDays + 1)), "天"); UpdateDayRemainTime(); activityDayText.text = Language.Get("WishingPool103", Language.Get(StringUtility.Contact("Num_CHS_", operation.GetActivityDay()))); totalDayText.text = Language.Get("WishingPool101", Language.Get(StringUtility.Contact("Num_CHS_", operation.totalDays + 1))); } #region 许愿逻辑 @@ -105,7 +109,7 @@ { for(int i = 0; i < wishingCells.Count; i++) { var rect = wishingCells[i].wishRect; var rect = wishingCells[i].transform as RectTransform; var des = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, rect); var src = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, dragItem.dragItemRect); var dis = Vector3.Distance(des.center, src.center); @@ -174,36 +178,8 @@ private void UpdateWishItemByIndex(int index) { WishingPoolModel.WishingWellItem wellItem = null; var wishCell = wishingCells[index]; bool isWishData = wishingModel.TryGetWishDataByIndex(index, out wellItem); if (isWishData) { wishCell.itemBaisc.gameObject.SetActive(true); wishCell.noneItemObj.gameObject.SetActive(false); ItemCellModel cellModel = new ItemCellModel(wellItem.itemId, false, (ulong)wellItem.itemCount, wellItem.isBind); wishCell.itemBaisc.Init(cellModel); wishCell.itemBaisc.cellBtn.RemoveAllListeners(); wishCell.itemBaisc.cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(wellItem.itemId, true, (ulong)wellItem.itemCount,-1,wellItem.isBind); tipsModel.SetItemTipsModel(attrData); }); } else { wishCell.itemBaisc.gameObject.SetActive(false); wishCell.noneItemObj.gameObject.SetActive(true); } } [Serializable] public class WishingCell { public RectTransform wishRect; public CommonItemBaisc itemBaisc; public GameObject noneItemObj; public Button noneItemBtn; wishCell.Display(index); } [Serializable] @@ -224,18 +200,37 @@ } } private void UpdateSecond() { if (operation == null) return; UpdateFreeWishCool(); UpdateDayRemainTime(); } private void UpdateDayRemainTime() { dayRemainTime.text = Language.Get("WishingPool104", TimeUtility.SecondsToHMS(operation.GetResetSurplusTime())); } private void UpdateFreeWishCool() { int second = 0; bool isCool = wishingModel.TryGetFreeWishCoolTime(out second); if (isCool) { freeRefreshWishBtn.gameObject.SetActive(false); freeWishCoolText.gameObject.SetActive(true); freeWishCoolText.text = TimeUtility.SecondsToHMS(second); moneyRefreshWishBtn.gameObject.SetActive(true); moneyValueText.text = "100"; freeWishCoolText.text = Language.Get("WishingPool102", TimeUtility.SecondsToHMS(second)); } else { freeRefreshWishBtn.gameObject.SetActive(true); freeWishCoolText.gameObject.SetActive(false); moneyRefreshWishBtn.gameObject.SetActive(false); } } @@ -259,18 +254,14 @@ WindowCenter.Instance.Open<WishingWarehouseWin>(); } private void ClickRefreshWish() private void ClickMoneyRefreshWish() { int second = 0; bool isCool = wishingModel.TryGetFreeWishCoolTime(out second); if(isCool) { wishingModel.SendRefreshPoolInfo(0); } } else { } private void ClickFreeRefreshWish() { wishingModel.SendRefreshPoolInfo(1); } #endregion
@@ -6,6 +6,7 @@ { public class WishingWarehouseWin : Window { [SerializeField] Button closeBtn; [SerializeField] ScrollerController wishGroupCtrl; WishingPoolModel wishModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } } protected override void BindController() @@ -15,7 +16,7 @@ protected override void AddListeners() { closeBtn.AddListener(CloseClick); } protected override void OnPreOpen() System/Team/GroupDungeonChallengeProcessor.cs
@@ -26,6 +26,7 @@ var cB910 = new CB910_tagCGQueryTeamMemFuncData(); cB910.TeamMemFuncType = 0; GameNetSystem.Instance.SendInfo(cB910); main.IsSend = false; StartCoroutine(Co_DelayShowFloorChooseWin(_isAutoMatch)); } } @@ -80,7 +81,10 @@ IEnumerator Co_DelayShowFloorChooseWin(bool _isAutoMatch) { yield return WaitingForSecondConst.WaitMS700; if (!main.IsSend) { yield break; } if (main.LayerNumber == -1) { main.LayerNumberNow = 0;
