From 4ea946c865004b076437fbd40c52bfa72a47f84b Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 30 九月 2025 17:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
Sprite/4Interactable/mail_img_68.png.meta | 127 +++++++++++++++++++++++++
UI/HomeWin.prefab | 2
UI/MailInfoWin.prefab | 81 ++++++++++++++++
Sprite/MainUI/mainui_img_168.png | 0
UI/MainWin.prefab | 8
Sprite/4Interactable/mail_img_51.png | 0
Sprite/4Interactable/mail_img_68.png | 0
UI/MailWin.prefab | 79 +++++++++++++++
Sprite/4Interactable.spriteatlasv2 | 1
9 files changed, 292 insertions(+), 6 deletions(-)
diff --git a/Sprite/4Interactable.spriteatlasv2 b/Sprite/4Interactable.spriteatlasv2
index 9bc9b56..1484f50 100644
--- a/Sprite/4Interactable.spriteatlasv2
+++ b/Sprite/4Interactable.spriteatlasv2
@@ -113,4 +113,5 @@
- {fileID: 2800000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
- {fileID: 2800000, guid: 387750fa3f96ba14286328e1772d4825, type: 3}
- {fileID: 2800000, guid: c407e3698f5d9ae448bd64b758b7b6d3, type: 3}
+ - {fileID: 2800000, guid: 6787ae4f4db9ee445af1d8859179af58, type: 3}
m_IsVariant: 0
diff --git a/Sprite/4Interactable/mail_img_51.png b/Sprite/4Interactable/mail_img_51.png
index efa382c..32d33ba 100644
--- a/Sprite/4Interactable/mail_img_51.png
+++ b/Sprite/4Interactable/mail_img_51.png
Binary files differ
diff --git a/Sprite/4Interactable/mail_img_68.png b/Sprite/4Interactable/mail_img_68.png
new file mode 100644
index 0000000..371775e
--- /dev/null
+++ b/Sprite/4Interactable/mail_img_68.png
Binary files differ
diff --git a/Sprite/4Interactable/mail_img_68.png.meta b/Sprite/4Interactable/mail_img_68.png.meta
new file mode 100644
index 0000000..6de5566
--- /dev/null
+++ b/Sprite/4Interactable/mail_img_68.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 6787ae4f4db9ee445af1d8859179af58
+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: 1
+ 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: ui/sprite/4interactable
+ assetBundleVariant:
diff --git a/Sprite/MainUI/mainui_img_168.png b/Sprite/MainUI/mainui_img_168.png
index 829066f..357cd8a 100644
--- a/Sprite/MainUI/mainui_img_168.png
+++ b/Sprite/MainUI/mainui_img_168.png
Binary files differ
diff --git a/UI/HomeWin.prefab b/UI/HomeWin.prefab
index ccdfdd8..09867db 100644
--- a/UI/HomeWin.prefab
+++ b/UI/HomeWin.prefab
@@ -20432,7 +20432,7 @@
awardIcon: {fileID: 1111681550410987029}
awardCnt: {fileID: 2945941900084955427}
taskEffect: {fileID: 8958247659939950748}
- lvUPEffect: {fileID: 0}
+ lvUPEffect: {fileID: 6766646780777622227}
bossBtn: {fileID: 9120170603066106678}
mainLevelWaves:
- {fileID: 4363884048540832395}
diff --git a/UI/MailInfoWin.prefab b/UI/MailInfoWin.prefab
index 306aa12..c7a1d50 100644
--- a/UI/MailInfoWin.prefab
+++ b/UI/MailInfoWin.prefab
@@ -146,6 +146,7 @@
txtAwardInfo: {fileID: 8509209717619310979}
scrAward: {fileID: 1074127726212676004}
txtExpiryDate: {fileID: 4057192196610321825}
+ imgHasAward: {fileID: 4632006105486622819}
btnHave: {fileID: 5226762331995763094}
btnDelete: {fileID: 3571055499590906856}
--- !u!1 &80511508165703706
@@ -331,7 +332,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &2656783900289896532
RectTransform:
m_ObjectHideFlags: 0
@@ -1545,6 +1546,83 @@
m_KeyName:
m_ColorType: 0
m_BGColorType: 0
+--- !u!1 &4491966484597880393
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3148267413693014995}
+ - component: {fileID: 6349003540621434016}
+ - component: {fileID: 4632006105486622819}
+ m_Layer: 5
+ m_Name: imgHasAward
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3148267413693014995
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4491966484597880393}
+ 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: 2580237946958849834}
+ 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: 22, y: 192.5}
+ m_SizeDelta: {x: 44, y: 33}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6349003540621434016
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4491966484597880393}
+ m_CullTransparentMesh: 1
+--- !u!114 &4632006105486622819
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4491966484597880393}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5eec31867c0c74f4aa2eeade969eec0e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 6787ae4f4db9ee445af1d8859179af58, 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
+ m_Gray: 0
+ m_IconKey:
--- !u!1 &4663844513706165002
GameObject:
m_ObjectHideFlags: 0
@@ -2623,6 +2701,7 @@
- {fileID: 2219243220158869367}
- {fileID: 4728794154194216648}
- {fileID: 7348977364742412953}
+ - {fileID: 3148267413693014995}
- {fileID: 1769898961499073072}
- {fileID: 5810538631223917095}
- {fileID: 6790140514827799336}
diff --git a/UI/MailWin.prefab b/UI/MailWin.prefab
index f610087..914c934 100644
--- a/UI/MailWin.prefab
+++ b/UI/MailWin.prefab
@@ -2468,6 +2468,7 @@
- {fileID: 8698955510845850640}
- {fileID: 1106474089561341526}
- {fileID: 3864595913494050304}
+ - {fileID: 1412029637101845981}
- {fileID: 803097488412621964}
- {fileID: 6774307873905005086}
m_Father: {fileID: 7650562467788929453}
@@ -2495,6 +2496,7 @@
btnMail: {fileID: 5727190556701727555}
imgMask: {fileID: 6168606083195711343}
imgRed: {fileID: 6598128182531020369}
+ imgHasAward: {fileID: 995745526966138037}
txtTitle: {fileID: 9163884607280969435}
txtDate: {fileID: 7009752811471710582}
--- !u!114 &5727190556701727555
@@ -3247,6 +3249,83 @@
m_KeyName: MailCategory0
m_ColorType: 0
m_BGColorType: 0
+--- !u!1 &7772036583016991295
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1412029637101845981}
+ - component: {fileID: 8554918100960874549}
+ - component: {fileID: 995745526966138037}
+ m_Layer: 5
+ m_Name: imgHasAward
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1412029637101845981
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7772036583016991295}
+ 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: 90948190062790210}
+ 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: -239.7, y: -41}
+ m_SizeDelta: {x: 44, y: 33}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8554918100960874549
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7772036583016991295}
+ m_CullTransparentMesh: 1
+--- !u!114 &995745526966138037
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7772036583016991295}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5eec31867c0c74f4aa2eeade969eec0e, 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: 6787ae4f4db9ee445af1d8859179af58, 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
+ m_Gray: 0
+ m_IconKey:
--- !u!1 &8085012032587351382
GameObject:
m_ObjectHideFlags: 0
diff --git a/UI/MainWin.prefab b/UI/MainWin.prefab
index a3bd74a..c8a265a 100644
--- a/UI/MainWin.prefab
+++ b/UI/MainWin.prefab
@@ -2275,8 +2275,8 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: fb20612222e75a94290a64abfac86701, type: 3}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 40beb306617106c4b9f54a7755cd3861, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -3855,8 +3855,8 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 41eaf0e74e7f8a048bb21b450e8b0e38, type: 3}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 40beb306617106c4b9f54a7755cd3861, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
--
Gitblit v1.8.0