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-06-14 20:26:21 +08:00
parent 232f7708b6
commit 84dd7cba1f
10 changed files with 2616 additions and 1877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/Scenes/UIScene.unity
-9
View File
@@ -3553,7 +3553,6 @@ GameObject:
m_Component:
- component: {fileID: 2030479794}
- component: {fileID: 2030479797}
- component: {fileID: 2030479796}
- component: {fileID: 2030479795}
m_Layer: 5
m_Name: UICamera
@@ -3625,14 +3624,6 @@ MonoBehaviour:
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!81 &2030479796
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2030479793}
m_Enabled: 1
--- !u!20 &2030479797
Camera:
m_ObjectHideFlags: 0
Assets/MyGame/Scripts/Net/APIRequestList_User.cs
+23
View File
@@ -82,5 +82,28 @@ namespace Assets.MyGame.Scripts.Net
}, callback);
}
#endregion
#region Notice_公告
/// <summary>
/// 获取公告列表（POST）
/// 返回：List&lt;GetEmailByPageResponse&gt;
/// </summary>
public static void GetNoticeList(Action<List<GetEmailByPageResponse>> callback)
{
//APIManager.Response<List<GetEmailByPageResponse>>(APIType.Notice_List, new { }, callback);
}
/// <summary>
/// 获取公告详情，未读自动变为已读（GET）
/// 参数：公告 id
/// 返回：GetEmailByPageResponse
/// </summary>
public static void GetNotice(GetEmailParam req, Action<GetEmailByPageResponse> callback)
{
APIManager.Response<GetEmailByPageResponse>(APIType.Notice_Get, req, callback);
}
#endregion
}
}
Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab
+57 -1
View File
@@ -73,7 +73,8 @@ PrefabInstance:
propertyPath: m_CameraType
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 320796858721524587, guid: 185787de59441cf49be38e6b31956cd1, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
@@ -81,6 +82,10 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 5786818863089195692}
- targetCorrespondingSourceObject: {fileID: 1264887924163234, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
insertIndex: -1
addedObject: {fileID: 3615978696677865829}
- targetCorrespondingSourceObject: {fileID: 1913982629221611, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
insertIndex: -1
@@ -90,6 +95,57 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 5171096580736390918}
m_SourcePrefab: {fileID: 100100000, guid: 185787de59441cf49be38e6b31956cd1, type: 3}
--- !u!1 &2982629942220973619 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1264887924163234, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
m_PrefabInstance: {fileID: 2981400861485360273}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3615978696677865829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2982629942220973619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
- {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5786818863089195692}
m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp
m_MethodName: SetScore
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5786818863089195692}
m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp
m_MethodName: Die
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &2982826138642937302 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1461080587964743, guid: 185787de59441cf49be38e6b31956cd1,
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+21 -38
View File
@@ -128,7 +128,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public Toggle toggle_Three;
public Toggle toggle_Shuang;
public Toggle toggle_BaoZou;
public Image img_BaoZou;
public Image img_BaoZou;
public float frenzyDuration = 5f; // 疯狂状态持续时间
public float currFrenzyTime = 0f;
public Toggle toggle_BingFeng;
@@ -151,7 +151,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
AudioClip bulletClip;
public List<int> paoBeiList=new List<int>();
public List<int> paoBeiList = new List<int>();
public ProgressBar JinDuTiao;
#region UI
@@ -172,9 +172,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
int l = GameManager.Instance.gameData.currRoomData.roomLevel;
foreach (var item in GameManager.Instance.gameConfig.roomConfigs)
{
if (item.gameType== t && l == GameManager.Instance.gameData.currRoomData.roomLevel)
if (item.gameType == t && l == GameManager.Instance.gameData.currRoomData.roomLevel)
{
paoBeiList= item.cannonMultipleList;
paoBeiList = item.cannonMultipleList;
}
}
string roomId = GameManager.Instance.gameData.currRoomData.roomId;
@@ -190,7 +190,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
foreach (var item in list_Sits)
{
if (item.posID== roomJoinNotice.position)
if (item.posID == roomJoinNotice.position)
{
currSitData = item;
@@ -389,11 +389,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
HandleInput();
HandleAutoRotate();
HandleInput();
CheckLockTargetValid();//锁定目标失效自动清除
HandleAutoFire(); // 自动开火真正发射
HandleLock();
UpdateLockFX();
@@ -875,7 +875,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
targetMonster = m;
targetHitPos = m.transform;
// 优先用活跃 collider；否则用 lockPoint；再否则留 transform
// 优先用活跃 collider
if (m.colliderList != null && m.colliderList.Count > 0)
{
foreach (var col in m.colliderList)
@@ -883,10 +883,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (col.gameObject.activeInHierarchy) { targetHitPos = col; break; }
}
}
else if (m.lockPoint != null)
{
targetHitPos = m.lockPoint;
}
}
if (targetMonster != null)
@@ -1000,11 +996,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
switch (monster.fishenum)
{
case FishTypeEnum.特殊Boss: return 5;
case FishTypeEnum.Boss鱼: return 4;
case FishTypeEnum.特殊鱼: return 3;
case FishTypeEnum.黄金鱼: return 2;
case FishTypeEnum.普通鱼: return 1;
default: return 0;
case FishTypeEnum.Boss鱼: return 4;
case FishTypeEnum.特殊鱼: return 3;
case FishTypeEnum.黄金鱼: return 2;
case FishTypeEnum.普通鱼: return 1;
default: return 0;
}
}
@@ -1058,10 +1054,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (col.gameObject.activeInHierarchy) { pos = col; break; }
}
}
else if (m.lockPoint != null)
{
pos = m.lockPoint;
}
result.Add((m, pos));
selected.Add(m.guid);
@@ -1171,8 +1163,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (!sit.monCotl_Lock_Position.gameObject.activeInHierarchy)
{
bool found = false;
if (sit.monCotl_Lock.colliderList != null && sit.monCotl_Lock.colliderList.Count > 0)
if (sit.monCotl_Lock.colliderList != null)
{
foreach (Transform t in sit.monCotl_Lock.colliderList)
{
@@ -1180,17 +1171,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
sit.monCotl_Lock_Position = t;
pos = sit.monCotl_Lock_Position.position;
found = true;
break;
}
}
}
if (!found)
{
sit.monCotl_Lock_Position = sit.monCotl_Lock.lockPoint ?? sit.monCotl_Lock.transform;
pos = sit.monCotl_Lock_Position.position;
found = true;
}
if (!sit.monCotl_Lock_Position.gameObject.activeInHierarchy)
{
if (sit.lockFX.activeSelf)
@@ -1206,10 +1190,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
pos.z = Camera.main.transform.position.z + 1;
sit.lockFX.transform.position = pos;
}
}
private void CheckLockTargetValid()
@@ -1248,9 +1232,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
MonsterContral target = FindAutoLockTarget();
if (target != null)
{
Transform lockTr = target.lockPoint ?? target.transform;
currSitData.SetLockTarget(target, lockTr);
if (target.colliderList.Count>0)
currSitData.SetLockTarget(target, target.transform);
if (target.colliderList.Count > 0)
{
for (int i = 0; i < target.colliderList.Count; i++)
{
@@ -1420,7 +1403,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
private void SyncLock(List<string> monsterguid,int index=-1)
private void SyncLock(List<string> monsterguid, int index = -1)
{
SyncGameData sgd = new SyncGameData
{
@@ -1430,7 +1413,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
frameData = new FrameData_ChangeAutoTarget
{
targetGuid = monsterguid,
colliderIndex=index,
colliderIndex = index,
}
};
WebSocketSendList.SyncGameData(sgd);
@@ -1509,7 +1492,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (monster.colliderList != null && monster.colliderList.Count > 0 && data.colliderIndex != -1)
hitPos = monster.colliderList[data.colliderIndex];
else
hitPos = monster.lockPoint ?? monster.transform;
hitPos = monster.transform;
list_Sits[sync.sitPos].SetLockTarget(monster, hitPos);
}
Assets/MyGame/aa/UI/Home/Sub/AnnouncementPanel.prefab
+2375 -1817
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_AnnouncementPanel.cs
+8 -12
View File
@@ -1,18 +1,14 @@
using System.Collections;
using Assets.MyGame.Scripts.Net;
using Assets.MyGame.Scripts.Net.APIRequest.Params;
using Assets.MyGame.Scripts.Net.APIResponses.HomeMain_User;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class UIHome_BY_AnnouncementPanel : UIHome_BY_EmailPanel
/// <summary>公告面板：继承邮件面板，只读查看，无领取/删除按钮</summary>
public class UIHome_BY_AnnouncementPanel : SubUIBase
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_VIPPanel.cs
+1
View File
@@ -75,6 +75,7 @@ public class UIHome_BY_VIPPanel : SubUIBase
}
protected override void OnShow(object args = null)
{
base.OnShow(args);
var vip = GameManager.Instance.user.assets;
var vipEX = GameManager.Instance.user.@static;
var vipDatas = GameManager.Instance.gameConfig.vipLevelConfigs;
Assets/MyGame/aa/UI/Home/UIHomeMain.cs
+4
View File
@@ -146,6 +146,10 @@ public class UIHomeMain : UIBase
btn_Announcenment.onClick.AddListener(() =>
{
subUIManager.ShowAsync(UIPanel.AnnouncementPanel);
//APIRequestList.GetNoticeList((list) =>
//{
// subUIManager.ShowAsync(UIPanel.AnnouncementPanel, list);
//});
});
btn_Rank.onClick.AddListener(() =>
{
Assets/UIResources/Home/邮件&公告/DLGG_title01.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

Assets/UIResources/Home/邮件&公告/DLGG_title01.png.meta
+127
View File
@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 52e84d312244a6249947e2aac2c1d524
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
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: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant: