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-07-07 19:30:09 +08:00
parent 59ac67304d
commit 1989ada6a0
11 changed files with 76 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+9 -9
View File
@@ -621,17 +621,17 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
//bossTimer = 3f;
if (!fishTypeConfig.TryGetValue(FishTypeEnum.Boss鱼, out var bossList) || bossList.Count == 0)
return;
foreach (var item in bossList)
{
if (item.fishNumber == "13037")
item.isCreate = 2;
if (item.fishNumber == "11035")
item.isCreate = 2;
// if (item.fishNumber == "11030")
//foreach (var item in bossList)
//{
// if (item.fishNumber == "13037")
// item.isCreate = 2;
}
// if (item.fishNumber == "11035")
// item.isCreate = 2;
// // if (item.fishNumber == "11030")
// // item.isCreate = 2;
//}
StartCoroutine(buchongfu(bossList, bossCount, fishDatas_hashCodekey_Boss, bossRecentList, bossRecentMax));
Assets/MyGame/aa/UI/Home/Sub/Rank/RankLineItem.cs
+1 -1
View File
@@ -78,7 +78,7 @@ public class RankLineItem : MonoBehaviour
obj.GetComponentInChildren<TextMeshProUGUI>().text = rankNum.ToString();
break;
}
userName.text = name;
userName.text = name.Length > 4 ? name.Substring(0, 2) + "**" + name.Substring(name.Length - 2) : name;
userLevel.text = level;
userScore.text = score;
if (sprite != null) avatar.sprite = sprite;
Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab
+3 -3
View File
@@ -2457,7 +2457,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 109.42847, y: 40.795776}
m_AnchoredPosition: {x: 53.75006, y: 9.294495}
m_SizeDelta: {x: 951, y: 94}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8650438328523187941
@@ -2585,8 +2585,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7520877011385796256}
- {fileID: 4892502646925578988}
- {fileID: 7520877011385796256}
m_Father: {fileID: 6684598796625886529}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4841,7 +4841,7 @@ RectTransform:
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: -330, y: 4.000107}
m_AnchoredPosition: {x: -299, y: 4.000107}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1410655219483306998
Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab
+1 -1
View File
@@ -6280,7 +6280,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4329a250da890ef4c9ffd312330639a0, type: 3}
m_Sprite: {fileID: 21300000, guid: dce6bfd06c270234fac3cc7855b070f4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab
+3 -3
View File
@@ -1858,7 +1858,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9cef5a03e6de060458fb10455af7594f, type: 3}
m_Sprite: {fileID: 21300000, guid: a52487c0501db6b4b8e684ded0e25eff, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -4309,7 +4309,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8440d789d2547de47b33547a6bef09a6, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -5587,7 +5587,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9cef5a03e6de060458fb10455af7594f, type: 3}
m_Sprite: {fileID: 21300000, guid: a52487c0501db6b4b8e684ded0e25eff, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs
+18
View File
@@ -227,6 +227,9 @@ public class UIHome_BY_ItemListPanels : SubUIBase
itemList = TurretResourcesData.GetTurretDataByType(turretType);
}
// 过滤不售卖的（未拥有且对应碎片 isSale=false）
itemList = FilterUnsoldItems(itemList);
// 排序：已获得的在前
itemList.Sort((a, b) =>
{
@@ -334,6 +337,21 @@ public class UIHome_BY_ItemListPanels : SubUIBase
// ==================== 筛选 ====================
private List<TurretResourcesData> FilterUnsoldItems(List<TurretResourcesData> list)
{
var propConfig = GameManager.Instance?.gameConfig?.propConfig;
if (propConfig == null || propConfig.Count == 0) return list;
return list.FindAll(d =>
{
if (IsItemOwned(d.turretNumber)) return true;
// 在道具表中查找，只有明确 isSale=false 才隐藏
var prop = propConfig.Find(p => p.number == d.turretNumber.ToString());
return prop == null || prop.isSale;
});
}
private List<TurretResourcesData> ApplyFilter(List<TurretResourcesData> list)
{
return _currentFilter switch
Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab
+1 -1
View File
@@ -14270,7 +14270,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_Interactable: 0
m_TargetGraphic: {fileID: 2389073473255830349}
m_FillRect: {fileID: 938778988416786579}
m_HandleRect: {fileID: 1127137568909999032}
Assets/TextMesh Pro/Resources/Fonts & Materials/SourceHanSans SDF.asset
+28 -5
View File
File diff suppressed because one or more lines are too long
Assets/UIResources/Home/炮台/图层 16.png.meta
+2 -2
View File
@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 42, y: 41, z: 44, w: 43}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -113,7 +113,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []
Assets/UIResources/Home/炮台/图层 17.png.meta
+2 -2
View File
@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 38, y: 43, z: 35, w: 37}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -113,7 +113,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []
Assets/app_icon.png.meta
+8 -8
View File
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -112,7 +112,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices: