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

1

Browse Source
This commit is contained in:
wz1531
2026-09-09 15:22:03 +08:00
parent 986911b63f
commit ebc693831b
5 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/Fish_XJMH.asset
+14
View File
@@ -241,6 +241,13 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 24533977623a0364d91544fdd053f7dc
m_Address: Assets/Art/FengLei/ResLY/bundles/by_room_common/bundles/atlas/atlas_by_a_zhuanpanfish_0/7001.asset
m_ReadOnly: 0
m_SerializedLabels:
- TuJian
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 24cad78ef1d76554491ec8490c4b8188
m_Address: Assets/MyGame/aa/Game/XJMH/Sound/PW_DialWeaponDouble.ogg
m_ReadOnly: 0
@@ -451,6 +458,13 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3f80f21ed6a43c244b58452765e7d8c5
m_Address: Assets/Art/FengLei/ResLY/bundles/by_room_common/bundles/atlas/atlas_by_a_zhuanpanfish_0/Z_4030.asset
m_ReadOnly: 0
m_SerializedLabels:
- TuJian
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 40a8bb5d7c1d4884abaac72c6385e5c0
m_Address: Assets/MyGame/aa/Game/XJMH/Sound/PW_MagicEmotion_3.ogg
m_ReadOnly: 0
Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab
+4 -4
View File
@@ -10585,7 +10585,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4841427236217427560
RectTransform:
m_ObjectHideFlags: 0
@@ -13110,7 +13110,7 @@ PrefabInstance:
- target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
@@ -13120,7 +13120,7 @@ PrefabInstance:
- target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
@@ -13255,7 +13255,7 @@ PrefabInstance:
- target: {fileID: 7125234996501131867, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7125234996501131867, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
Assets/MyGame/aa/UI/Home/Sub/BackPack/BackPackPropItem.cs
+1
View File
@@ -24,6 +24,7 @@ public enum PropEnum
技能 = 10,
召唤卡 = 11,
VIP经验 = 12,
鱼雷=13,
}
/// <summary>
Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab
+7 -7
View File
@@ -575,7 +575,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3174882362259273176
RectTransform:
m_ObjectHideFlags: 0
@@ -2625,7 +2625,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1294867866617724791
RectTransform:
m_ObjectHideFlags: 0
@@ -3417,7 +3417,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3100363271065808740
RectTransform:
m_ObjectHideFlags: 0
@@ -9318,7 +9318,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2275665051133058286
RectTransform:
m_ObjectHideFlags: 0
@@ -9735,7 +9735,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3259884545548523870
RectTransform:
m_ObjectHideFlags: 0
@@ -10284,7 +10284,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5489727431002386589
RectTransform:
m_ObjectHideFlags: 0
@@ -11633,7 +11633,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4317662669388983497
RectTransform:
m_ObjectHideFlags: 0
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs
+23
View File
@@ -139,6 +139,22 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
});
}
}
/// <summary>快速开始：按金币从高级场到低级场匹配，能进高级场就不进低级场，都不满足进初级场</summary>
private int GetQuickStartLeaveByGold()
{
long gold = GameManager.Instance.user.assets.gold;
var roomConfigs = GameManager.Instance?.gameConfig?.roomConfigs;
if (roomConfigs == null || roomConfigs.Count == 0) return 1;
string gameTypeStr = ((int)currGameType).ToString();
for (int level = 3; level >= 2; level--)
{
var cfg = roomConfigs.Find(r => r.gameType.ToString() == gameTypeStr && r.roomLevel == level);
if (cfg != null && (cfg.roomGoldLimit <= 0 || gold >= cfg.roomGoldLimit))
return level;
}
return 1;
}
public static void StartGame(RoomChangeResponse o)
{
@@ -301,6 +317,13 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
{
UIManager.Instance.Get<UIHomeMain>(UIPanel.HomeMainPanel).subUIManager.ShowAsync(UIPanel.SettingPanel);
});
currUIDefault.btn_StartQuickly.onClick.RemoveAllListeners();
currUIDefault.btn_StartQuickly.onClick.AddListener(() =>
{
isMySelectRoom = false;
leave = GetQuickStartLeaveByGold();
OnSelectRoom(leave);
});
currUIDefault.UpdateData(GameManager.Instance.user.BaseInfo.userName, GameManager.Instance.user.assets.gold.ToString(), GameManager.Instance.user.assets.diamond.ToString());
// 头像/头像框：初始加载 + 之后由事件自动刷新