wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cun

Browse Source
This commit is contained in:
wz1531
2026-06-21 22:38:18 +08:00
parent 5f2c6d8ecd
commit c335d04ae3
46 changed files with 604 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Framework/Tool/UITool/SubUIManager.cs
+1
View File
@@ -118,6 +118,7 @@ public class SubUIManager
instance.uIManager = this;
instance.name = $"Sub_{type}_Panel";
instance.Init(type);
instance.transform.SetAsLastSibling(); // 新面板放到最上层
panels[type] = instance;
//return instance;
Assets/Framework/Tool/UITool/UIBase.cs
+1
View File
@@ -23,6 +23,7 @@ public abstract class UIBase : MonoBehaviour
public virtual void Show(object args = null)
{
gameObject.SetActive(true);
transform.SetAsLastSibling(); // 每次激活都放到最上层
OnShow(args);
}
Assets/Framework/Tool/UITool/UIManager.cs
+1
View File
@@ -378,6 +378,7 @@ public class UIManager : MonoSingleton<UIManager>
var instance = Instantiate(obj, uiRoot).GetComponent<UIBase>();
instance.name = $"{type}_Panel";
instance.Init(type);
instance.transform.SetAsLastSibling(); // 新面板放到最上层
panels[type] = instance;
return instance;
Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+6 -4
View File
@@ -373,6 +373,10 @@ public class MonsterContral : MonoBehaviour
/// <param name="nextPos">下一帧目标位置</param>
private void ApplyFacingDirection(Vector2 nextPos)
{
Transform child = transform.GetChild(0);
Vector3 localPos = Vector3.zero;
localPos.z = depthOffset;
child.localPosition = localPos;
if (!isRotate) return;
Vector2 toNext = nextPos - (Vector2)transform.position;
@@ -396,8 +400,7 @@ public class MonsterContral : MonoBehaviour
// 是否为子物体单独控制朝向和深度
if (ischild0)
{
Transform child = transform.GetChild(0);
Vector3 localPos = Vector3.zero;
//// 父物体朝向
switch (forwordXYZ)
@@ -477,8 +480,7 @@ public class MonsterContral : MonoBehaviour
// case "Z": localPos.x = depthOffset; break;
// case "-Z": localPos.x = -depthOffset; break;
//}
localPos.z = depthOffset;
child.localPosition = localPos;
}
else
{
Assets/MyGame/Scripts/Manager/GameManager.cs
+19 -1
View File
@@ -32,6 +32,9 @@ public class GameManager : MonoSingleton<GameManager>
/// <summary>头像字典（name → sprite），从 Resources/Avatar 加载</summary>
private Dictionary<string, Sprite> avatarSpriteDict = new Dictionary<string, Sprite>();
/// <summary>默认头像（新账号无头像时使用）</summary>
private Sprite defaultAvatar;
/// <summary>触发头像更新事件</summary>
public void TriggerAvatarChanged(Sprite sprite)
{
@@ -74,10 +77,25 @@ public class GameManager : MonoSingleton<GameManager>
public Sprite GetAvatarSprite(string avatarName)
{
if (avatarSpriteDict.Count == 0) InitAvatarCache();
avatarSpriteDict.TryGetValue(avatarName, out var sprite);
if (string.IsNullOrEmpty(avatarName) || !avatarSpriteDict.TryGetValue(avatarName, out var sprite))
sprite = GetDefaultAvatar();
return sprite;
}
private Sprite GetDefaultAvatar()
{
if (defaultAvatar == null && avatarSpriteDict.Count > 0)
{
// 取缓存中第一个头像作为默认
foreach (var kv in avatarSpriteDict)
{
defaultAvatar = kv.Value;
break;
}
}
return defaultAvatar;
}
/// <summary>
/// 更换头像：上传服务端 → 更新本地 → 触发全局刷新
/// </summary>
Assets/MyGame/Scripts/Net/APIManager.cs
+3
View File
@@ -147,6 +147,9 @@ namespace Assets.MyGame.Scripts.Net
dic_API[APIType.User_GetNoReadCount] = "/api/User/GetNoReadCount";
dic_API[APIType.User_GetEmailByPage] = "/api/User/GetEmailByPage";
// ---------------- Rank ----------------
dic_API[APIType.Rank_GetUserList] = "/api/User/GetUserList";
// ---------------- Customer ----------------
dic_API[APIType.Customer_Start] = "/customerapi/Customer/start";
dic_API[APIType.Customer_Message] = "/customerapi/Customer/message";
Assets/MyGame/Scripts/Net/APIRequest/Params/BaseListPageParam.cs
+15
View File
@@ -0,0 +1,15 @@
using System;
namespace Assets.MyGame.Scripts.Net.APIRequest.Params
{
/// <summary>
/// 通用分页查询参数（排行榜/用户列表共用）
/// </summary>
[Serializable]
public class BaseListPageParam : RequestParamBase
{
public string keyWord;
public int pageIndex;
public int pageSize;
}
}
Assets/MyGame/Scripts/Net/APIRequest/Params/BaseListPageParam.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4cddc697ed7d2f640b59af8f06ab52f8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/Scripts/Net/APIRequestList_User.cs
+13
View File
@@ -2,6 +2,7 @@
using Assets.MyGame.Scripts.Net.APIRequest;
using Assets.MyGame.Scripts.Net.APIRequest.Objs;
using Assets.MyGame.Scripts.Net.APIRequest.Params;
using Assets.MyGame.Scripts.Net.APIResponses;
using Assets.MyGame.Scripts.Net.APIResponses.HomeMain_User;
using Newtonsoft.Json.Linq;
using System;
@@ -96,6 +97,18 @@ namespace Assets.MyGame.Scripts.Net
#endregion
#region Rank
/// <summary>
/// 获取排行榜（用户列表分页）（POST）
/// </summary>
public static void GetRankList(BaseListPageParam req, Action<List<UserListItemDto>> callback)
{
APIManager.Response<List<UserListItemDto>>(APIType.Rank_GetUserList, req, callback);
}
#endregion
#region Notice_公告
/// <summary>
Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs
+4
View File
@@ -63,6 +63,10 @@ public class UserBaseInfo
}
}
action?.Invoke(avatarSprite);
// 兜底：下载或加载失败 → 用默认头像
if (avatarSprite == null)
action?.Invoke(GameManager.Instance.GetAvatarSprite(null));
}
public void UpdateAvatar(System.Action<Sprite> action)
{
Assets/MyGame/Scripts/Net/APIResponses/UserListItemDto.cs
+18
View File
@@ -0,0 +1,18 @@
using System;
namespace Assets.MyGame.Scripts.Net.APIResponses
{
/// <summary>
/// 用户列表项DTO（排行榜用）
/// </summary>
[Serializable]
public class UserListItemDto
{
public string id;
public string number;
public string userName;
public string avatarUrl;
public string mobile;
public long createTime;
}
}
Assets/MyGame/Scripts/Net/APIResponses/UserListItemDto.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e7f3e620112ad5b4aa52623a9a739847
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/Scripts/Net/APIType.cs
+5
View File
@@ -298,6 +298,11 @@ namespace Assets.MyGame.Scripts.Net
User_GetEmailByPage,
// ---------------- Rank ----------------
/// <summary>排行榜（用户列表分页）（POST）</summary>
Rank_GetUserList,
// ---------------- Customer ----------------
/// <summary>发起会话（POST）</summary>
Customer_Start,
Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab
+5
View File
@@ -115,6 +115,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8605164213497951839, guid: d91ace63f3f1e264397418d302f4f473,
type: 3}
propertyPath: m_LocalPosition.z
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8610223115821126918, guid: d91ace63f3f1e264397418d302f4f473,
type: 3}
propertyPath: m_IsActive
Assets/MyGame/aa/Game/HHWK/Boss/BaoChuanJuXie/Game177_bcjx.prefab
+1 -1
View File
@@ -111,7 +111,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 500
bossName: "\u5B9D\u8239\u5C45\u87F9"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/ChangE/Game177_changE.prefab
+1 -1
View File
@@ -7987,7 +7987,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 450
bossName:
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/ShaSeng/Game177_shaseng.prefab
+1 -1
View File
@@ -80,7 +80,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 400
bossName: "\u6C99\u50E7"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/Game177_wukong.prefab
+1 -1
View File
@@ -111,7 +111,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 350
bossName: "\u5B59\u609F\u7A7A"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/TangSeng/Game177_tangseng.prefab
+1 -1
View File
@@ -80,7 +80,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 300
bossName: "\u5510\u50E7"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab
+1 -1
View File
@@ -111,7 +111,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 250
bossName: "\u94C1\u6247\u516C\u4E3B"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/Game177_lm.prefab
+1 -1
View File
@@ -6214,7 +6214,7 @@ MonoBehaviour:
isRotate: 1
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 200
bossName:
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/YiLong/Game177_yilong.prefab
+118 -3
View File
@@ -100,6 +100,11 @@ PrefabInstance:
propertyPath: m_Offset.x
value: -3.4000726
objectReference: {fileID: 0}
- target: {fileID: 6414401409018064826, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6414472216874967272, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_Size.x
@@ -110,6 +115,11 @@ PrefabInstance:
propertyPath: m_Offset.x
value: -1.7395163
objectReference: {fileID: 0}
- target: {fileID: 6414472216874967272, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6414496109225616091, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_Size.y
@@ -120,6 +130,11 @@ PrefabInstance:
propertyPath: m_Offset.y
value: -0.10855079
objectReference: {fileID: 0}
- target: {fileID: 6414496109225616091, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6414686863564926510, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_Size.x
@@ -140,6 +155,11 @@ PrefabInstance:
propertyPath: m_Offset.y
value: -0.123410285
objectReference: {fileID: 0}
- target: {fileID: 6414686863564926510, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415071583217880489, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_Size.x
@@ -160,6 +180,11 @@ PrefabInstance:
propertyPath: m_Offset.y
value: 0.22654834
objectReference: {fileID: 0}
- target: {fileID: 6415071583217880489, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415244078764786773, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_Size.x
@@ -180,6 +205,16 @@ PrefabInstance:
propertyPath: m_Offset.y
value: 3.333702
objectReference: {fileID: 0}
- target: {fileID: 6415244078764786773, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415298222636642766, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415356669069262458, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_Size.x
@@ -200,6 +235,11 @@ PrefabInstance:
propertyPath: m_Offset.y
value: 3.0468569
objectReference: {fileID: 0}
- target: {fileID: 6415356669069262458, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415367008366643217, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_Size.x
@@ -220,6 +260,11 @@ PrefabInstance:
propertyPath: m_Offset.y
value: -5.633999
objectReference: {fileID: 0}
- target: {fileID: 6415367008366643217, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6473932968833178269, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
@@ -1078,7 +1123,7 @@ BoxCollider2D:
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -23.22151, y: 23.701927}
@@ -1094,12 +1139,72 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 47.44302, y: 66.057236}
m_EdgeRadius: 0
--- !u!4 &850818250561405081 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6472010960230307798, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &850837928023044910 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6472039399422534753, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &850920370278596006 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471838196619471593, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &850927662444221409 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471847685159453870, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &851139102571902031 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471777789843972864, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &851223718047722927 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471569771497831136, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &851227750532647675 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471582764400614836, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &851339252447298365 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471414929694938226, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &851345481893981482 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471412260508744293, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &851433570019202359 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471500381867328120, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!4 &851532665510979932 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6471326799031434771, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
m_PrefabInstance: {fileID: 5917594796932175695}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7753516636887016399 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4144863413135012992, guid: 3a2d8052104ea1a45aab65e5511276c0,
@@ -1146,14 +1251,24 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
colliderList:
- {fileID: 851532665510979932}
- {fileID: 850837928023044910}
- {fileID: 851223718047722927}
- {fileID: 851139102571902031}
- {fileID: 850818250561405081}
- {fileID: 851433570019202359}
- {fileID: 850927662444221409}
- {fileID: 850920370278596006}
- {fileID: 851345481893981482}
- {fileID: 851227750532647675}
lockPoint: {fileID: 4281476599764317452}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 40
bossName:
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/YuXI/Game177_yuxi.prefab
+1 -1
View File
@@ -111,7 +111,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 150
bossName: "\u4E5D\u9F99\u7389\u73BA"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/ZhuBaJie/Game177_zhubajie.prefab
+1 -1
View File
@@ -80,7 +80,7 @@ MonoBehaviour:
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
depthOffset: 100
bossName: "\u732A\u516B\u6212"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab
+1
View File
@@ -635,5 +635,6 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 80
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 850
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab
+1
View File
@@ -371,6 +371,7 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 860
--- !u!1001 &6537198470344860617
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab
+1
View File
@@ -403,6 +403,7 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 870
--- !u!1001 &6972630653134549612
Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab
+1
View File
@@ -483,6 +483,7 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 880
--- !u!1001 &8244822918661465325
Assets/MyGame/aa/Game/HHWK/MonsterTSY/SDY/fish_4003 Variant.prefab
+2 -1
View File
@@ -1382,8 +1382,9 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 0
depthOffset: 650
--- !u!4 &1062192247788273864 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4279359913592680, guid: d07fb8dc1478ea24293cdd941f2bd570,
Assets/MyGame/aa/Game/HHWK/MonsterTSY/ZDX/fish_4014 Variant.prefab
+2 -1
View File
@@ -989,8 +989,9 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 0
depthOffset: 600
animator: {fileID: 6617330980387136865}
--- !u!4 &2385675320109601041 stripped
Transform:
Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadIngTemp/UIGame177LoadingView.prefab
+8 -8
View File
@@ -33,8 +33,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: 0, y: 1}
m_SizeDelta: {x: -6, y: 13}
m_AnchoredPosition: {x: 0, y: -0.625}
m_SizeDelta: {x: -6, y: 16.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1877290135688313422
GameObject:
@@ -372,7 +372,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4b69fe9693fd2c141bb339b5845e9cce, type: 2}
m_Sprite: {fileID: 21300000, guid: 21aba0fad42bb514ca3c4736d613404b, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -743,7 +743,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bdd026d36a2878c4db9e3d2b6d872eec, type: 3}
m_Sprite: {fileID: 21300000, guid: b662d68aa72889a4ab14d123bf2528bb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -785,10 +785,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6742571252770769959}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1516, y: 39}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &354248555231389183
CanvasRenderer:
@@ -818,7 +818,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f8b4f1b5bbe4b2949a335042f718e798, type: 3}
m_Sprite: {fileID: 21300000, guid: b6500b217c54ea748a764274526b39bc, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
-43
View File
@@ -4289,17 +4289,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 8080891624328096898}
m_Modifications:
- target: {fileID: 1390265440039436894, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b6500b217c54ea748a764274526b39bc,
type: 3}
- target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchorMax.y
@@ -4310,11 +4299,6 @@ PrefabInstance:
propertyPath: m_Name
value: UIGame177LoadingView
objectReference: {fileID: 0}
- target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_Pivot.x
@@ -4415,33 +4399,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6565779888811675298, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_Value
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7062296130803999109, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_SizeDelta.y
value: 16.25
objectReference: {fileID: 0}
- target: {fileID: 7062296130803999109, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.625
objectReference: {fileID: 0}
- target: {fileID: 8405686698745501670, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b662d68aa72889a4ab14d123bf2528bb,
type: 3}
- target: {fileID: 8637219767191096938, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 21aba0fad42bb514ca3c4736d613404b,
type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
+6
View File
@@ -5215,6 +5215,12 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8405686698745501670, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: bdd026d36a2878c4db9e3d2b6d872eec,
type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/UI/Home/Sub/AnnouncementPanel.prefab
+2 -850
View File
@@ -168,201 +168,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &723013611057243738
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5057548614191917257}
- component: {fileID: 7539630409661803153}
- component: {fileID: 8594183468884507029}
- component: {fileID: 4904928782643916748}
m_Layer: 5
m_Name: "\u9886\u53D6\u6309\u94AE"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5057548614191917257
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 723013611057243738}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 251.49994, y: -270.49994}
m_SizeDelta: {x: 238, y: 77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7539630409661803153
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 723013611057243738}
m_CullTransparentMesh: 1
--- !u!114 &8594183468884507029
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 723013611057243738}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bc293d7b527df0845a6f4204561c3d30, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4904928782643916748
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 723013611057243738}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8594183468884507029}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &772016446328260238
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8437386164409788644}
- component: {fileID: 6231967331204848307}
- component: {fileID: 4459590297130192175}
m_Layer: 5
m_Name: /200
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8437386164409788644
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 772016446328260238}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -400.4, y: -379}
m_SizeDelta: {x: 74, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6231967331204848307
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 772016446328260238}
m_CullTransparentMesh: 1
--- !u!114 &4459590297130192175
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 772016446328260238}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: cf0fa2be7c5ff1b49b4e0a6cdd696273, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &815698123708479890
GameObject:
m_ObjectHideFlags: 0
@@ -939,7 +744,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u60CA\u559C\u55E8\u7FFB\u5929\u5956\u52B1\u8865\u53D1"
m_text: 123456789
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
@@ -1084,126 +889,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2639350310625604210
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1103288703126358344}
- component: {fileID: 4671937217021296687}
- component: {fileID: 3143273126278331507}
- component: {fileID: 6561313699405443453}
m_Layer: 5
m_Name: "\u5220\u9664\u5DF2\u8BFB\u6309\u94AE"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1103288703126358344
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2639350310625604210}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -514.50006, y: 89.49994}
m_SizeDelta: {x: 302, y: 95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4671937217021296687
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2639350310625604210}
m_CullTransparentMesh: 1
--- !u!114 &3143273126278331507
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2639350310625604210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 1015d0142ba970749ad8f8bc24070510, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &6561313699405443453
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2639350310625604210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3143273126278331507}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &2956710431147757803
GameObject:
m_ObjectHideFlags: 0
@@ -1236,18 +921,10 @@ RectTransform:
m_Children:
- {fileID: 1780132959866077342}
- {fileID: 4220055264042913434}
- {fileID: 6304838196116227659}
- {fileID: 1103288703126358344}
- {fileID: 5057548614191917257}
- {fileID: 464782042801920451}
- {fileID: 6717283708928789301}
- {fileID: 434454534960014115}
- {fileID: 6989339178613641565}
- {fileID: 651006881729639183}
- {fileID: 2057393494114663294}
- {fileID: 8849231887095206039}
- {fileID: 8437386164409788644}
- {fileID: 6860687002815979654}
m_Father: {fileID: 8438768417078030804}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1948,141 +1625,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5261517850467126379
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8849231887095206039}
- component: {fileID: 8170288202574442630}
- component: {fileID: 508302625347614933}
m_Layer: 5
m_Name: EmalNum
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8849231887095206039
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5261517850467126379}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -478.05786, y: -376.00006}
m_SizeDelta: {x: 37.1159, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8170288202574442630
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5261517850467126379}
m_CullTransparentMesh: 1
--- !u!114 &508302625347614933
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5261517850467126379}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 100
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4282110714
m_fontColor: {r: 0.9803922, g: 0.8235295, b: 0.23137257, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &5463961943663974108
GameObject:
m_ObjectHideFlags: 0
@@ -2190,126 +1732,6 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5846489158930343983
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6304838196116227659}
- component: {fileID: 1369437020131361705}
- component: {fileID: 8837770632080334929}
- component: {fileID: 2423231339219152326}
m_Layer: 5
m_Name: "\u4E00\u952E\u9886\u53D6\u6309\u94AE"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6304838196116227659
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5846489158930343983}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -176.99994, y: 90}
m_SizeDelta: {x: 303, y: 96}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1369437020131361705
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5846489158930343983}
m_CullTransparentMesh: 1
--- !u!114 &8837770632080334929
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5846489158930343983}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63b6d778239305c46b3bdee1a8472a1c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2423231339219152326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5846489158930343983}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8837770632080334929}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5848261035638072353
GameObject:
m_ObjectHideFlags: 0
@@ -2476,126 +1898,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6404211951657641934
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 464782042801920451}
- component: {fileID: 8443402777541477483}
- component: {fileID: 5612285255373386122}
- component: {fileID: 8250567911641874101}
m_Layer: 5
m_Name: "\u5220\u9664\u6309\u94AE"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &464782042801920451
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6404211951657641934}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 251.49994, y: -270.99994}
m_SizeDelta: {x: 236, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8443402777541477483
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6404211951657641934}
m_CullTransparentMesh: 1
--- !u!114 &5612285255373386122
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6404211951657641934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 82e50f71e9600634fa24c5aea507e396, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8250567911641874101
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6404211951657641934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5612285255373386122}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6571096641050217122
GameObject:
m_ObjectHideFlags: 0
@@ -2687,7 +1989,7 @@ MonoBehaviour:
uIEffect: 1
tMPText_Header: {fileID: 119125515455866556}
tMPText_Content: {fileID: 5682666235955808693}
tMPText_EmailCount: {fileID: 508302625347614933}
tMPText_EmailCount: {fileID: 0}
btn_Receive: {fileID: 0}
btn_Dlete: {fileID: 0}
btn_AllDlete: {fileID: 0}
@@ -2917,156 +2219,6 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7303242285089063539
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6860687002815979654}
- component: {fileID: 8264280191350652979}
- component: {fileID: 2768115834704686772}
m_Layer: 5
m_Name: "\u90AE\u4EF6\u6570\u91CF\uFF1A"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6860687002815979654
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7303242285089063539}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -589.50006, y: -376.50006}
m_SizeDelta: {x: 154, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8264280191350652979
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7303242285089063539}
m_CullTransparentMesh: 1
--- !u!114 &2768115834704686772
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7303242285089063539}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 162e3e49d5f8d6547aa59674ab14902c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7389589463861482057
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2057393494114663294}
- component: {fileID: 8477915064074564274}
- component: {fileID: 4629795550466468219}
m_Layer: 5
m_Name: "\u90AE\u4EF6\u81F3\u591A\u4FDD\u755930\u5929,\u8BF7\u53CA\u65F6\u9886\u53D6"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2057393494114663294
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7389589463861482057}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3395642005095280329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -501.5, y: -433}
m_SizeDelta: {x: 478, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8477915064074564274
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7389589463861482057}
m_CullTransparentMesh: 1
--- !u!114 &4629795550466468219
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7389589463861482057}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 33807cab94b870b40a63c684485f25f7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7433793843186135471
GameObject:
m_ObjectHideFlags: 0
Assets/MyGame/aa/UI/Home/Sub/Rank/RankLineItem.cs
+30 -10
View File
@@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
@@ -11,12 +9,35 @@ public class RankLineItem : MonoBehaviour
public TextMeshProUGUI userLevel;
public TextMeshProUGUI userScore;
public Image avatar;
public void Init(int rankNum,string name,string level,string score,Sprite sprite)
private string myAvatarName;
private void OnEnable()
{
foreach (Transform item in obj_rankNum.transform)
{
item.gameObject.SetActive(false);
GameManager.Instance.OnAvatarChanged += OnAvatarChanged;
}
private void OnDisable()
{
if (GameManager.Instance != null)
GameManager.Instance.OnAvatarChanged -= OnAvatarChanged;
}
private void OnAvatarChanged(Sprite sprite)
{
// 如果换的头像和本行用户的 avatarUrl 一致，自动刷新
if (!string.IsNullOrEmpty(myAvatarName) && sprite != null)
{
var cached = GameManager.Instance.GetAvatarSprite(myAvatarName);
if (cached != null) avatar.sprite = cached;
}
}
public void Init(int rankNum, string name, string level, string score, Sprite sprite, string avatarUrl = null)
{
myAvatarName = avatarUrl; foreach (Transform item in obj_rankNum.transform)
item.gameObject.SetActive(false);
switch (rankNum)
{
case 1:
@@ -29,15 +50,14 @@ public class RankLineItem : MonoBehaviour
obj_rankNum.transform.GetChild(2).gameObject.SetActive(true);
break;
default:
GameObject obj = obj_rankNum.transform.GetChild(3).gameObject;
var obj = obj_rankNum.transform.GetChild(3).gameObject;
obj.SetActive(true);
obj.GetComponent<TextMeshProUGUI>().text= rankNum.ToString();
obj.GetComponent<TextMeshProUGUI>().text = rankNum.ToString();
break;
}
userName.text = name;
userLevel.text = level;
userScore.text = score;
avatar.sprite = sprite;
if (sprite != null) avatar.sprite = sprite;
}
}
Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab
+19
View File
@@ -1107,6 +1107,7 @@ GameObject:
- component: {fileID: 8096412430408969747}
- component: {fileID: 7942660861686505055}
- component: {fileID: 5842558471734556222}
- component: {fileID: 119203538957789953}
m_Layer: 0
m_Name: MyLine
m_TagString: Untagged
@@ -1177,6 +1178,23 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &119203538957789953
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4518412734063221731}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 822f03eee95c85544bbe39e0c35ec530, type: 3}
m_Name:
m_EditorClassIdentifier:
obj_rankNum: {fileID: 3334948630355572652}
userName: {fileID: 5242203354241153718}
userLevel: {fileID: 6229766061555147168}
userScore: {fileID: 2935221353683179608}
avatar: {fileID: 9220268455570876363}
--- !u!1 &4559792023597000273
GameObject:
m_ObjectHideFlags: 0
@@ -3145,4 +3163,5 @@ MonoBehaviour:
btn_Close: {fileID: 1239086426526207562}
uIEffect: 1
obj_LinePrefab: {fileID: 6386860272759417549}
currobj_Line: {fileID: 119203538957789953}
prefabRankLineItem_parent: {fileID: 0}
Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab
+71 -1
View File
@@ -200347,6 +200347,36 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 5097118419095978737}
m_Modifications:
- target: {fileID: 678913131303693655, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 678913131303693655, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 678913131303693655, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 678913131303693655, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 678913131303693655, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_SizeDelta.x
value: -121
objectReference: {fileID: 0}
- target: {fileID: 678913131303693655, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_SizeDelta.y
value: -85
objectReference: {fileID: 0}
- target: {fileID: 678913131303693655, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_ConstrainProportionsScale
@@ -200545,7 +200575,7 @@ PrefabInstance:
- target: {fileID: 3713989706896098098, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_SizeDelta.x
value: -1070.3362
value: -1070.4722
objectReference: {fileID: 0}
- target: {fileID: 5104397326568747399, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
@@ -200577,6 +200607,46 @@ PrefabInstance:
propertyPath: panel_PanelParent
value:
objectReference: {fileID: 5589047771026659740}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.975
objectReference: {fileID: 0}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.9524963
objectReference: {fileID: 0}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.25634664
objectReference: {fileID: 0}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.133
objectReference: {fileID: 0}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_SizeDelta.x
value: -9.663818
objectReference: {fileID: 0}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_SizeDelta.y
value: -9.903687
objectReference: {fileID: 0}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -3
objectReference: {fileID: 0}
- target: {fileID: 7460543648826535570, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 8172060234334021856, guid: 9351da778e1c18c4f9243b73d7569c66,
type: 3}
propertyPath: m_Name
Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab
+3 -3
View File
@@ -1650,10 +1650,10 @@ RectTransform:
- {fileID: 4095128562714369029}
m_Father: {fileID: 8904622048228621647}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1624, y: 750}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4665894233708067697
CanvasRenderer:
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_AnnouncementPanel.cs
+3 -39
View File
@@ -6,52 +6,16 @@ using UnityEngine;
using UnityEngine.UI;
/// <summary>公告面板：继承邮件面板，只读查看，无领取/删除按钮</summary>
public class UIHome_BY_AnnouncementPanel : UIHome_BY_EmailPanel
public class UIHome_BY_AnnouncementPanel : SubUIBase
{
public override void Awake()
{
base.Awake();
SubUIBase sub = this;
if (btn_Receive != null) btn_Receive.gameObject.SetActive(false);
if (btn_Dlete != null) btn_Dlete.gameObject.SetActive(false);
if (btn_AllReceive != null) btn_AllReceive.gameObject.SetActive(false);
if (btn_AllDlete != null) btn_AllDlete.gameObject.SetActive(false);
}
protected override void OnShow(object args = null)
{
foreach (var item in dic_EmalItems.Values)
Destroy(item.gameObject);
dic_GetEmailByPageResponses.Clear();
dic_EmalItems.Clear();
if (args == null) return;
var list = (List<GetEmailByPageResponse>)args;
foreach (var item in list)
{
dic_GetEmailByPageResponses[item.id] = item;
var emailItem = Instantiate(itemPrefab.gameObject, itemPrefabParent).GetComponent<EmalItem>();
emailItem.Init(this, item.title, item.sendTime, item.isReward, item.isRead);
dic_EmalItems[item.id] = emailItem;
emailItem.GetComponent<Toggle>().onValueChanged.AddListener((a) =>
{
if (!a) return;
currEmailID = item.id;
tMPText_Header.text = item.title;
tMPText_Content.text = item.content;
APIRequestList.GetNotice(new GetEmailParam { id = currEmailID }, (res) =>
{
if (dic_EmalItems.ContainsKey(res.id))
dic_EmalItems[res.id].obj_YiDu.SetActive(true);
if (dic_GetEmailByPageResponses.ContainsKey(res.id))
dic_GetEmailByPageResponses[res.id].isRead = true;
});
});
}
tMPText_EmailCount.text = itemPrefabParent.childCount.ToString();
base.OnShow(args);
}
}
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_RankPanel.cs
+40 -1
View File
@@ -1,9 +1,48 @@
using System.Collections;
using Assets.Framework.Tool;
using Assets.MyGame.Scripts.Net;
using Assets.MyGame.Scripts.Net.APIRequest.Params;
using Assets.MyGame.Scripts.Net.APIResponses;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class UIHome_BY_RankPanel : SubUIBase
{
public RankLineItem obj_LinePrefab;
public RankLineItem currobj_Line;
public Transform prefabRankLineItem_parent;
protected override void OnShow(object args = null)
{
base.OnShow(args);
LoadRankData();
}
private void LoadRankData()
{
APIRequestList.GetRankList(new BaseListPageParam
{
keyWord = "",
pageIndex = 0,
pageSize = 100
}, list =>
{
if (list == null) return;
// 清空旧列表
for (int i = prefabRankLineItem_parent.childCount - 1; i >= 0; i--)
Destroy(prefabRankLineItem_parent.GetChild(i).gameObject);
for (int i = 0; i < list.Count; i++)
{
var data = list[i];
var item = Instantiate(obj_LinePrefab, prefabRankLineItem_parent);
// 头像走 GameManager 缓存加载（无头像时自动返回默认）
var sprite = GameManager.Instance.GetAvatarSprite(data.avatarUrl);
item.Init(i + 1, data.userName, "—", data.number, sprite, data.avatarUrl);
}
});
}
}
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs
+6
View File
@@ -212,6 +212,12 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
uIManager.Hide(this);
});
currUIDefault.btn_SheZhi.onClick.RemoveAllListeners();
currUIDefault.btn_SheZhi.onClick.AddListener(() =>
{
UIManager.Instance.Get<UIHomeMain>(UIPanel.HomeMainPanel).subUIManager.ShowAsync(UIPanel.SettingPanel);
});
currUIDefault.UpdateData(GameManager.Instance.user.BaseInfo.userName, GameManager.Instance.user.assets.gold.ToString(), GameManager.Instance.user.assets.diamond.ToString());
// 头像：初始加载 + 之后由 OnAvatarChanged 事件自动刷新
GameManager.Instance.user.BaseInfo.UpdateAvatar((a) => { if (a != null) currUIDefault.sprite_Avatar.sprite = a; });
Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab
+1 -2
View File
@@ -4554,8 +4554,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
btn_Close: {fileID: 7195850217269370359}
uIEffect: 1
sprite_Avatar: {fileID: 0}
sprite_AvatarFrame: {fileID: 0}
sprite_Avatar: {fileID: 3540025539893487929}
tMPText_Name: {fileID: 895702622827427414}
tMPText_ID: {fileID: 7948657928600599647}
tMPText_UserNumber: {fileID: 7565582315516907914}
Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs
+1 -2
View File
@@ -12,7 +12,6 @@ public class UserInfoPanel : SubUIBase
{
[Header("基础信息")]
public Image sprite_Avatar;
public Image sprite_AvatarFrame;
public TextMeshProUGUI tMPText_Name;
public TextMeshProUGUI tMPText_ID;
public TextMeshProUGUI tMPText_UserNumber;
@@ -64,7 +63,7 @@ public class UserInfoPanel : SubUIBase
/// </summary>
private void LoadAvatarImage(Image target, string avatarUrl)
{
if (target == null || string.IsNullOrEmpty(avatarUrl)) return;
if (target == null) return;
var sprite = gameManager.GetAvatarSprite(avatarUrl);
if (sprite != null)
Assets/app_icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

Assets/app_icon.png.meta
+127
View File
@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: dce6bfd06c270234fac3cc7855b070f4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/ProjectSettings.asset
+40 -32
View File
@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: Fish
productName: "\u670B\u5BA2\u6355\u9C7C"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -298,7 +298,14 @@ PlayerSettings:
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: dce6bfd06c270234fac3cc7855b070f4, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons:
- m_BuildTarget: iPhone
m_Icons:
@@ -399,6 +406,36 @@ PlayerSettings:
m_SubKind: App Store
- m_BuildTarget: Android
m_Icons:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 432
m_Height: 432
@@ -459,36 +496,6 @@ PlayerSettings:
m_Height: 36
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 0
m_SubKind:
- m_BuildTarget: tvOS
m_Icons:
- m_Textures: []
@@ -873,6 +880,7 @@ PlayerSettings:
PS5: 1
QNX: 1
Stadia: 1
Standalone: 0
VisionOS: 1
WebGL: 1
Windows Store Apps: 1