AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-07 16:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/AlanWeekend/TEngine

Browse Source
This commit is contained in:
Weekend
2023-10-30 23:04:05 +08:00
parent 2c00d103cb 1d56437d9f
commit c9fe83c2bd
46 changed files with 1769 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UIListBase.cs
View File

@@ -277,7 +277,7 @@ namespace GameLogic
item.SetSelected(false);
}
item = GetItem(m_selectIndex) as IListSelectItem;
item = GetItem(selectIndex) as IListSelectItem;
if (item != null)
{
item.SetSelected(true);

15
UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UILoopGridWidget.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using TEngine;
using UnityEngine;
namespace GameLogic
@@ -17,7 +18,7 @@ namespace GameLogic
/// <summary>
/// Item字典
/// </summary>
private Dictionary<int, TItem> m_itemCache = new Dictionary<int, TItem>();
private GameFrameworkDictionary<int, TItem> m_itemCache = new GameFrameworkDictionary<int, TItem>();
/// <summary>
/// 计算偏差后的ItemList
@@ -163,9 +164,19 @@ namespace GameLogic
m_items.Clear();
for (int i = 0; i < m_itemCache.Count; i++)
{
m_items.Add(m_itemCache[i]);
m_items.Add(m_itemCache.GetValueByIndex(i));
}
return m_items;
}
/// <summary>
/// 获取Item。
/// </summary>
/// <param name="index">索引。</param>
/// <returns>TItem。</returns>
public TItem GetItemByIndex(int index)
{
return m_itemCache.GetValueByIndex(index);
}
}
}

11
UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UILoopListViewWidget.cs
View File

@@ -8,7 +8,7 @@ namespace GameLogic
{
public LoopListView LoopRectView { private set; get; }
private Dictionary<int, T> m_itemCache = new Dictionary<int, T>();
private GameFrameworkDictionary<int, T> m_itemCache = new GameFrameworkDictionary<int, T>();
public override void BindMemberProperty()
{
@@ -71,9 +71,8 @@ namespace GameLogic
List<T> list = new List<T>();
for (int i = 0; i < m_itemCache.Count; i++)
{
list.Add(m_itemCache[i]);
list.Add(m_itemCache.GetValueByIndex(i));
}
return list;
}
@@ -85,11 +84,11 @@ namespace GameLogic
/// <summary>
/// 获取Item。
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
/// <param name="index">索引。</param>
/// <returns>TItem。</returns>
public T GetItemByIndex(int index)
{
return m_itemCache[index];
return m_itemCache.GetValueByIndex(index);
}
}
}

19
UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UILoopListWidget.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using TEngine;
using UnityEngine;
namespace GameLogic
@@ -16,8 +17,9 @@ namespace GameLogic
/// <summary>
/// Item字典
/// <remarks>Key => GameObjectHashCode | Value => TItem.</remarks>
/// </summary>
private Dictionary<int, TItem> m_itemCache = new Dictionary<int, TItem>();
private GameFrameworkDictionary<int, TItem> m_itemCache = new GameFrameworkDictionary<int, TItem>();
/// <summary>
/// 计算偏差后的ItemList
@@ -159,7 +161,10 @@ namespace GameLogic
public List<TItem> GetItemList()
{
m_items.Clear();
m_items.AddRange(m_itemCache.Values);
for (int i = 0; i < m_itemCache.Count; i++)
{
m_items.Add(m_itemCache.GetValueByIndex(i));
}
return m_items;
}
@@ -171,5 +176,15 @@ namespace GameLogic
{
return LoopRectView.GetItemStartIndex();
}
/// <summary>
/// 获取Item。
/// </summary>
/// <param name="index">索引。</param>
/// <returns>TItem。</returns>
public TItem GetItemByIndex(int index)
{
return m_itemCache.GetValueByIndex(index);
}
}
}

26
UnityProject/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab
View File

@@ -812,7 +812,6 @@ GameObject:
- component: {fileID: 4070374929253206932}
- component: {fileID: 4872533144352319846}
- component: {fileID: 3352775805385032060}
- component: {fileID: 3859027068210555860}
m_Layer: 5
m_Name: UILoadTip
m_TagString: Untagged
@@ -880,31 +879,6 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 55
--- !u!114 &3859027068210555860
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7666412045263395013}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bcd11033283847ee8f7c71eedd9a4771, type: 3}
m_Name:
m_EditorClassIdentifier:
elements:
m_keys:
- m_btnUpdate
- m_btnIgnore
- m_textInfo
- m_textTittle
- m_btnPackage
m_values:
- {fileID: 2745714441875214452}
- {fileID: 467775921333773033}
- {fileID: 3862717357071106210}
- {fileID: 9127528276671758327}
- {fileID: 1387175525974173601}
--- !u!1 &8012535748721374403
GameObject:
m_ObjectHideFlags: 0

28
UnityProject/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab
View File

@@ -773,7 +773,6 @@ GameObject:
- component: {fileID: 1633508802563447727}
- component: {fileID: 5827342734203288403}
- component: {fileID: 4835021223508371640}
- component: {fileID: 903919243524269039}
m_Layer: 5
m_Name: UILoadUpdate
m_TagString: Untagged
@@ -843,33 +842,6 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 55
--- !u!114 &903919243524269039
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9130266365217219149}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bcd11033283847ee8f7c71eedd9a4771, type: 3}
m_Name:
m_EditorClassIdentifier:
elements:
m_keys:
- m_imgBackGround
- m_scrollbarProgress
- m_textDesc
- m_btnClear
- m_textAppid
- m_textResid
m_values:
- {fileID: 4652061626151979521}
- {fileID: 2347891492826839465}
- {fileID: 8666815445422661327}
- {fileID: 4232232858152633415}
- {fileID: 3038352660368000718}
- {fileID: 8143980099109665604}
--- !u!1 &9157096376857424144
GameObject:
m_ObjectHideFlags: 0

14
UnityProject/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs
View File

@@ -20,26 +20,22 @@ namespace GameMain
public MessageShowType ShowType = MessageShowType.None;
#region 脚本工具生成的代码
private Button m_btnPackage;
private Text m_textTittle;
private Text m_textInfo;
private Button m_btnIgnore;
private Button m_btnUpdate;
public override void ScriptGenerator()
{
CheckUIElement();
m_btnPackage = FChild<Button>("m_btnPackage");
m_textTittle = FChild<Text>("m_textTittle");
m_textInfo = FChild<Text>("m_textInfo");
m_btnIgnore = FChild<Button>("m_btnIgnore");
m_btnUpdate = FChild<Button>("m_btnUpdate");
m_btnPackage = FindChildComponent<Button>("BgImage/m_btnPackage");
m_textTittle = FindChildComponent<Text>("BgImage/m_textTittle");
m_textInfo = FindChildComponent<Text>("BgImage/m_textInfo");
m_btnIgnore = FindChildComponent<Button>("BgImage/Group/m_btnIgnore");
m_btnUpdate = FindChildComponent<Button>("BgImage/Group/m_btnUpdate");
m_btnPackage.onClick.AddListener(OnClickPackageBtn);
m_btnIgnore.onClick.AddListener(OnClickIgnoreBtn);
m_btnUpdate.onClick.AddListener(OnClickUpdateBtn);
}
#endregion
#region 事件

20
UnityProject/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs
View File

@@ -8,22 +8,22 @@ namespace GameMain
[Window(UILayer.UI, fromResources: true, location: "AssetLoad/UILoadUpdate",fullScreen:true)]
public class UILoadUpdate : UIWindow
{
private Scrollbar m_scrollbarProgress;
#region 脚本工具生成的代码
private Image m_imgBackGround;
private Scrollbar m_scrollbarProgress;
private Text m_textDesc;
private Button m_btnClear;
private Text m_textAppid;
private Text m_textResid;
public override void ScriptGenerator()
{
CheckUIElement();
m_imgBackGround = FChild<Image>("m_imgBackGround");
m_scrollbarProgress = FChild<Scrollbar>("m_scrollbarProgress");
m_textDesc = FChild<Text>("m_textDesc");
m_btnClear = FChild<Button>("m_btnClear");
m_textAppid = FChild<Text>("m_textAppid");
m_textResid = FChild<Text>("m_textResid");
m_imgBackGround = FindChildComponent<Image>("m_imgBackGround");
m_textDesc = FindChildComponent<Text>("m_textDesc");
m_btnClear = FindChildComponent<Button>("TopNode/m_btnClear");
m_textAppid = FindChildComponent<Text>("TopNode/m_textAppid");
m_textResid = FindChildComponent<Text>("TopNode/m_textResid");
m_scrollbarProgress = FindChildComponent<Scrollbar>("m_scrollbarProgress");
m_btnClear.onClick.AddListener(OnClickClearBtn);
}
#endregion
@@ -118,12 +118,12 @@ namespace GameMain
m_scrollbarProgress.size = progress;
}
protected override void Close()
public override void OnDestroy()
{
base.OnDestroy();
OnStop(null);
LoadUpdateLogic.Instance.DownloadCompleteAction -= DownLoad_Complete_Action;
LoadUpdateLogic.Instance.DownProgressAction -= DownLoad_Progress_Action;
base.Close();
}
}
}