From cf5f42cd017a6aa06968ad637a58bb7a46d0d6aa Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期一, 02 十二月 2024 18:15:05 +0800
Subject: [PATCH] 10301 仙缘调整界面文字大小,优化排版,福禄可领取物品增加摇动
---
UI/Sprite/LoopAct/XY_wz.png.meta | 127 +++++
UI/Sprite/LoopAct/XY_wz5.png | 0
UI/Window/FairyAffinityZhanLingWin.prefab | 128 ++++-
UI/Window/FairyAffinityWin.prefab | 316 ++++++++++++-
BuiltIn/ScriptableObjects/FunctionButton_FairyAffinity.asset | 6
UI/Window/FairyAffinityMissionActWin.prefab | 140 ++++-
UI/Sprite/LoopAct/XY_bj8.png | 0
UI/Sprite/LoopAct/XY_pp.png | 0
UI/Sprite/LoopAct/XY_pp.png.meta | 127 +++++
UI/Sprite/LoopAct/XY_flh.png | 0
UI/Sprite/LoopAct/XY_lblbk.png | 0
UI/Sprite/LoopAct/XY_tdlbk.png | 0
UI/Sprite/LoopAct/XY_flh.png.meta | 127 +++++
UI/Sprite/LoopAct/XY_wz.png | 0
UI/Sprite/LoopAct/XY_bj2.png | 0
UI/Sprite/LoopAct/XY_jb.png.meta | 127 +++++
UI/Sprite/LoopAct.spriteatlasv2 | 4
UI/Window/FairyAffinityRechargeGiftActWin.prefab | 108 ++++
UI/Sprite/LoopAct/XY_dj1.png | 0
UI/Window/FairyAffinityLoginActWin.prefab | 141 ++++-
UI/Sprite/LoopAct/XY_jb.png | 0
21 files changed, 1,204 insertions(+), 147 deletions(-)
diff --git a/BuiltIn/ScriptableObjects/FunctionButton_FairyAffinity.asset b/BuiltIn/ScriptableObjects/FunctionButton_FairyAffinity.asset
index c2ee4ee..a07fb4f 100644
--- a/BuiltIn/ScriptableObjects/FunctionButton_FairyAffinity.asset
+++ b/BuiltIn/ScriptableObjects/FunctionButton_FairyAffinity.asset
@@ -15,12 +15,12 @@
normal:
iconKey: FairyAffinityTab_Normal
fontColor: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
- fontSize: 18
+ fontSize: 22
selected:
iconKey: FairyAffinityTab_Selected
fontColor: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
- fontSize: 22
+ fontSize: 26
locked:
iconKey: FairyAffinityTab_Normal
fontColor: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
- fontSize: 18
+ fontSize: 22
diff --git a/UI/Sprite/LoopAct.spriteatlasv2 b/UI/Sprite/LoopAct.spriteatlasv2
index 8563565..a89d916 100644
--- a/UI/Sprite/LoopAct.spriteatlasv2
+++ b/UI/Sprite/LoopAct.spriteatlasv2
@@ -53,4 +53,8 @@
- {fileID: 2800000, guid: db3acf046d9091b42a332583513c60fa, type: 3}
- {fileID: 2800000, guid: f716b5d82d20e354ab865328ac4bb4f0, type: 3}
- {fileID: 2800000, guid: 7a0ffa93b2c200141848230e3e47d3fa, type: 3}
+ - {fileID: 2800000, guid: 6d7e3e9f1f695074789798663a336689, type: 3}
+ - {fileID: 2800000, guid: 6d80a354c82dc114dbced90802bd1a17, type: 3}
+ - {fileID: 2800000, guid: a5a82afc2cac0e14d9fe2fb82324b78e, type: 3}
+ - {fileID: 2800000, guid: 04ed6a00a1fa5a140b01c0fcce6c842d, type: 3}
m_IsVariant: 0
diff --git a/UI/Sprite/LoopAct/XY_bj2.png b/UI/Sprite/LoopAct/XY_bj2.png
index 7a88cb6..52d7e0e 100644
--- a/UI/Sprite/LoopAct/XY_bj2.png
+++ b/UI/Sprite/LoopAct/XY_bj2.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_bj8.png b/UI/Sprite/LoopAct/XY_bj8.png
index 3dc9cd2..ccd0bc7 100644
--- a/UI/Sprite/LoopAct/XY_bj8.png
+++ b/UI/Sprite/LoopAct/XY_bj8.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_dj1.png b/UI/Sprite/LoopAct/XY_dj1.png
index 7293bd5..028372b 100644
--- a/UI/Sprite/LoopAct/XY_dj1.png
+++ b/UI/Sprite/LoopAct/XY_dj1.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_flh.png b/UI/Sprite/LoopAct/XY_flh.png
new file mode 100644
index 0000000..3206988
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_flh.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_flh.png.meta b/UI/Sprite/LoopAct/XY_flh.png.meta
new file mode 100644
index 0000000..e68dc61
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_flh.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 6d7e3e9f1f695074789798663a336689
+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: ui/sprite/loopact
+ assetBundleVariant:
diff --git a/UI/Sprite/LoopAct/XY_jb.png b/UI/Sprite/LoopAct/XY_jb.png
new file mode 100644
index 0000000..c7bfb62
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_jb.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_jb.png.meta b/UI/Sprite/LoopAct/XY_jb.png.meta
new file mode 100644
index 0000000..2032625
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_jb.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 6d80a354c82dc114dbced90802bd1a17
+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: 8, z: 0, w: 10}
+ 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: 1537655665
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName: ui/sprite/loopact
+ assetBundleVariant:
diff --git a/UI/Sprite/LoopAct/XY_lblbk.png b/UI/Sprite/LoopAct/XY_lblbk.png
index 516cfdc..fdbfd17 100644
--- a/UI/Sprite/LoopAct/XY_lblbk.png
+++ b/UI/Sprite/LoopAct/XY_lblbk.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_pp.png b/UI/Sprite/LoopAct/XY_pp.png
new file mode 100644
index 0000000..fbfc73d
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_pp.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_pp.png.meta b/UI/Sprite/LoopAct/XY_pp.png.meta
new file mode 100644
index 0000000..b6a4f33
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_pp.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: a5a82afc2cac0e14d9fe2fb82324b78e
+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: ui/sprite/loopact
+ assetBundleVariant:
diff --git a/UI/Sprite/LoopAct/XY_tdlbk.png b/UI/Sprite/LoopAct/XY_tdlbk.png
index 54acad7..4034930 100644
--- a/UI/Sprite/LoopAct/XY_tdlbk.png
+++ b/UI/Sprite/LoopAct/XY_tdlbk.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_wz.png b/UI/Sprite/LoopAct/XY_wz.png
new file mode 100644
index 0000000..9144eb7
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_wz.png
Binary files differ
diff --git a/UI/Sprite/LoopAct/XY_wz.png.meta b/UI/Sprite/LoopAct/XY_wz.png.meta
new file mode 100644
index 0000000..b15fc30
--- /dev/null
+++ b/UI/Sprite/LoopAct/XY_wz.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 04ed6a00a1fa5a140b01c0fcce6c842d
+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: ui/sprite/loopact
+ assetBundleVariant:
diff --git a/UI/Sprite/LoopAct/XY_wz5.png b/UI/Sprite/LoopAct/XY_wz5.png
index 1b8c342..70847f3 100644
--- a/UI/Sprite/LoopAct/XY_wz5.png
+++ b/UI/Sprite/LoopAct/XY_wz5.png
Binary files differ
diff --git a/UI/Window/FairyAffinityLoginActWin.prefab b/UI/Window/FairyAffinityLoginActWin.prefab
index d56a9c9..7556ab9 100644
--- a/UI/Window/FairyAffinityLoginActWin.prefab
+++ b/UI/Window/FairyAffinityLoginActWin.prefab
@@ -146,7 +146,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -305,7 +305,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 22
+ m_MaxSize: 24
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -404,6 +404,7 @@
- component: {fileID: 6720957883368737687}
- component: {fileID: 2011471707132474460}
- component: {fileID: 3731353985812929011}
+ - component: {fileID: 9152034221412764454}
m_Layer: 0
m_Name: paidItemCell1
m_TagString: Untagged
@@ -454,6 +455,27 @@
m_Name:
m_EditorClassIdentifier:
m_Format: 2
+--- !u!114 &9152034221412764454
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 868175390261535399}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c79d7a9b820a4fb4391f05c98bb51c51, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 11400000, guid: 8a4fa3549e8e23644abc97a37f18b9ba, type: 2}
+ from: {x: 0, y: 0, z: 0}
+ to: {x: 0, y: 0, z: 20}
+ delayMode: 2
+ delay: 0
+ duration: 0.5
+ trigger: 0
+ wrapMode: 2
+ reversal: 0
--- !u!1 &1346759750554706539
GameObject:
m_ObjectHideFlags: 0
@@ -488,8 +510,8 @@
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: -1.2047005, y: 0}
- m_SizeDelta: {x: 97.59, y: 36}
+ m_AnchoredPosition: {x: -0.000022173, y: 0}
+ m_SizeDelta: {x: 90, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5070831573203258601
CanvasRenderer:
@@ -532,7 +554,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "N\xFAt th\xF4ng d\u1EE5ng"
+ m_Text: "9999\u5143"
m_IsKey: 0
m_KeyName:
m_ColorType: 7
@@ -563,15 +585,15 @@
m_GameObject: {fileID: 2653864043279104543}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 2290490120000827977}
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: 133.67131, y: 182.9}
- m_SizeDelta: {x: 128.067, y: 7.8748}
+ m_AnchoredPosition: {x: -309.5, y: 170.6}
+ m_SizeDelta: {x: 140, y: 7.8748}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1472457995636899310
CanvasRenderer:
@@ -614,7 +636,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 99999%
+ m_Text: 9999
m_IsKey: 0
m_KeyName:
m_ColorType: 0
@@ -645,15 +667,15 @@
m_GameObject: {fileID: 2808785471408977725}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+ m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 2290490120000827977}
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: 284.95, y: 159.28}
- m_SizeDelta: {x: 129.79, y: 8.0351}
+ m_AnchoredPosition: {x: -72.8, y: 135}
+ m_SizeDelta: {x: 150, y: 8.0351}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &169498864941782264
CanvasRenderer:
@@ -696,7 +718,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 9999
+ m_Text: 99999
m_IsKey: 0
m_KeyName:
m_ColorType: 0
@@ -848,7 +870,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 2
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -893,8 +915,8 @@
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: 345.8, y: 169.8}
- m_SizeDelta: {x: 56.8, y: 25}
+ m_AnchoredPosition: {x: 30.4, y: 148.3}
+ m_SizeDelta: {x: 100, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8111843744009851665
CanvasRenderer:
@@ -917,7 +939,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -930,7 +952,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 25
+ m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -940,7 +962,7 @@
m_Text: "\u4ED9\u7389\u5956\u52B1"
m_IsKey: 1
m_KeyName: FairyAffinity14
- m_ColorType: 7
+ m_ColorType: 10
--- !u!1 &3582273272896828589
GameObject:
m_ObjectHideFlags: 0
@@ -1090,7 +1112,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 2
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1215,7 +1237,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 324.2, y: 135}
- m_SizeDelta: {x: 100, y: 40}
+ m_SizeDelta: {x: 90, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &274108142220399246
MonoBehaviour:
@@ -1377,7 +1399,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 2
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1903,6 +1925,8 @@
- {fileID: 6238691791820844934}
freeHaves:
- {fileID: 283350413629352674}
+ freeItemCellTweenList:
+ - {fileID: 1382874371603731142}
itemCellExs:
- {fileID: 7126209381349113442}
- {fileID: 3731353985812929011}
@@ -1920,6 +1944,9 @@
reSignBtn: {fileID: 8236328377295052767}
waitSignText: {fileID: 3516176930269128429}
btnLateSign: {fileID: 736316097631444679}
+ paidItemCellTweenList:
+ - {fileID: 8231692404583932060}
+ - {fileID: 9152034221412764454}
--- !u!1 &6198171391259271494
GameObject:
m_ObjectHideFlags: 0
@@ -2364,8 +2391,8 @@
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: 82.7, y: 119.9}
- m_SizeDelta: {x: 531, y: 251}
+ m_AnchoredPosition: {x: 186.50005, y: 160.04}
+ m_SizeDelta: {x: 387, y: 113}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2443881932607854075
CanvasRenderer:
@@ -2645,7 +2672,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -2765,7 +2792,7 @@
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: 110.5, y: 8}
+ m_AnchoredPosition: {x: 110.5, y: 0}
m_SizeDelta: {x: 771.78, y: 500.15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7239390697083311421
@@ -2856,6 +2883,7 @@
- component: {fileID: 2178195034496226433}
- component: {fileID: 9155700301579234399}
- component: {fileID: 2010613703327478691}
+ - component: {fileID: 1382874371603731142}
m_Layer: 0
m_Name: freeItemCell
m_TagString: Untagged
@@ -2906,6 +2934,27 @@
m_Name:
m_EditorClassIdentifier:
m_Format: 2
+--- !u!114 &1382874371603731142
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7790722519967633347}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c79d7a9b820a4fb4391f05c98bb51c51, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 11400000, guid: 8a4fa3549e8e23644abc97a37f18b9ba, type: 2}
+ from: {x: 0, y: 0, z: 0}
+ to: {x: 0, y: 0, z: 20}
+ delayMode: 2
+ delay: 0
+ duration: 0.5
+ trigger: 0
+ wrapMode: 2
+ reversal: 0
--- !u!1 &7878763623166814420
GameObject:
m_ObjectHideFlags: 0
@@ -3097,8 +3146,8 @@
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: 202.5, y: 169.8}
- m_SizeDelta: {x: 100, y: 25}
+ m_AnchoredPosition: {x: -200.2, y: 148.3}
+ m_SizeDelta: {x: 150, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8696794505163213333
CanvasRenderer:
@@ -3121,7 +3170,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -3144,7 +3193,7 @@
m_Text: "\u89E3\u9501\u53EF\u83B7\u4EF7\u503C"
m_IsKey: 1
m_KeyName: FairyAffinity16
- m_ColorType: 7
+ m_ColorType: 10
--- !u!1 &8133722517346901622
GameObject:
m_ObjectHideFlags: 0
@@ -3216,7 +3265,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 22
+ m_MaxSize: 24
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -3298,7 +3347,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 5
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -3320,6 +3369,7 @@
- component: {fileID: 5439088447158435979}
- component: {fileID: 8999173191200449468}
- component: {fileID: 7126209381349113442}
+ - component: {fileID: 8231692404583932060}
m_Layer: 0
m_Name: paidItemCell0
m_TagString: Untagged
@@ -3370,6 +3420,27 @@
m_Name:
m_EditorClassIdentifier:
m_Format: 2
+--- !u!114 &8231692404583932060
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8728538355639333476}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c79d7a9b820a4fb4391f05c98bb51c51, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 11400000, guid: 8a4fa3549e8e23644abc97a37f18b9ba, type: 2}
+ from: {x: 0, y: 0, z: 0}
+ to: {x: 0, y: 0, z: 20}
+ delayMode: 2
+ delay: 0
+ duration: 0.5
+ trigger: 0
+ wrapMode: 2
+ reversal: 0
--- !u!1 &8764377755660342554
GameObject:
m_ObjectHideFlags: 0
@@ -3441,7 +3512,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 22
+ m_MaxSize: 24
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -3563,8 +3634,8 @@
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: 274.2, y: 196.80003}
- m_SizeDelta: {x: 200, y: 25}
+ m_AnchoredPosition: {x: -55.6, y: 195.54}
+ m_SizeDelta: {x: 359, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1499680280140159309
CanvasRenderer:
diff --git a/UI/Window/FairyAffinityMissionActWin.prefab b/UI/Window/FairyAffinityMissionActWin.prefab
index 0dc5eb6..e241fc2 100644
--- a/UI/Window/FairyAffinityMissionActWin.prefab
+++ b/UI/Window/FairyAffinityMissionActWin.prefab
@@ -188,8 +188,8 @@
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: 152.50012, y: 75.97505}
- m_SizeDelta: {x: 102, y: 80}
+ m_AnchoredPosition: {x: 152.5, y: 72.272}
+ m_SizeDelta: {x: 81.6718, y: 64.0565}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5239287495602732257
CanvasRenderer:
@@ -506,11 +506,11 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 20
+ m_FontSize: 22
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 2
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -718,8 +718,8 @@
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: 152.50012, y: 75.975006}
- m_SizeDelta: {x: 150, y: 50}
+ m_AnchoredPosition: {x: 152.50006, y: 69.6}
+ m_SizeDelta: {x: 100, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &284405385312707692
MonoBehaviour:
@@ -1088,8 +1088,8 @@
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: -166.08127, y: 131.97505}
- m_SizeDelta: {x: 109.7259, y: 20.4597}
+ m_AnchoredPosition: {x: -151.8, y: 122}
+ m_SizeDelta: {x: 150, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &117956106159684608
CanvasRenderer:
@@ -1207,7 +1207,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 2
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1289,7 +1289,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1334,8 +1334,8 @@
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: 119.33006, y: 109.565056}
- m_SizeDelta: {x: 168.3387, y: 12.8205}
+ m_AnchoredPosition: {x: 213.9, y: 95.555}
+ m_SizeDelta: {x: 150, y: 11.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2167407726585476013
CanvasRenderer:
@@ -1416,8 +1416,8 @@
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.52814, y: -3}
- m_SizeDelta: {x: 217.0563, y: 30}
+ m_AnchoredPosition: {x: -244.966, y: -3}
+ m_SizeDelta: {x: 227.932, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1279634453146436335
CanvasRenderer:
@@ -1453,7 +1453,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 5
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
@@ -1498,8 +1498,8 @@
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: 275.65515, y: 125.37504}
- m_SizeDelta: {x: 209.1698, y: 25}
+ m_AnchoredPosition: {x: 319.9, y: 110}
+ m_SizeDelta: {x: 120, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1773486565986879052
CanvasRenderer:
@@ -1626,6 +1626,83 @@
trigger: 0
wrapMode: 2
reversal: 0
+--- !u!1 &4707743553205361688
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2193268854216849427}
+ - component: {fileID: 7144249535455684985}
+ - component: {fileID: 6703823938220911240}
+ m_Layer: 0
+ m_Name: ImageEx
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2193268854216849427
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4707743553205361688}
+ 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: 7221245838318007783}
+ 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: 175.05, y: 95.555}
+ m_SizeDelta: {x: 324, y: 43}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7144249535455684985
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4707743553205361688}
+ m_CullTransparentMesh: 1
+--- !u!114 &6703823938220911240
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4707743553205361688}
+ 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: 04ed6a00a1fa5a140b01c0fcce6c842d, 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 &4760981045138564007
GameObject:
m_ObjectHideFlags: 0
@@ -1814,8 +1891,8 @@
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: 281.6222, y: 0}
- m_SizeDelta: {x: 188.2444, y: 38}
+ m_AnchoredPosition: {x: 276.40564, y: 0}
+ m_SizeDelta: {x: 198.6687, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7078605049462860303
CanvasRenderer:
@@ -1851,7 +1928,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
- m_MaxSize: 18
+ m_MaxSize: 20
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@@ -2024,8 +2101,8 @@
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: 0.3696, y: 0}
- m_SizeDelta: {x: 132.9147, y: 36}
+ m_AnchoredPosition: {x: -0.00061655045, y: 0}
+ m_SizeDelta: {x: 100, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2194532359641926620
CanvasRenderer:
@@ -2068,7 +2145,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "N\xFAt th\xF4ng d\u1EE5ng"
+ m_Text: "9999\u5143"
m_IsKey: 0
m_KeyName:
m_ColorType: 7
@@ -2106,8 +2183,8 @@
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: -65.73185, y: 125.37505}
- m_SizeDelta: {x: 266.5362, y: 25}
+ m_AnchoredPosition: {x: 35.3, y: 110}
+ m_SizeDelta: {x: 264.6497, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2767076966968950447
CanvasRenderer:
@@ -2256,7 +2333,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6505511973880079167}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ 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
@@ -2265,7 +2342,7 @@
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: -60, y: 196.77502}
+ m_AnchoredPosition: {x: -60, y: 191.20001}
m_SizeDelta: {x: 278, y: 59}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4487430342285686578
@@ -2346,6 +2423,7 @@
- {fileID: 7906402410085171707}
- {fileID: 4669226628249806043}
- {fileID: 5766654788182910358}
+ - {fileID: 2193268854216849427}
- {fileID: 6452615893221689299}
- {fileID: 5428783557696283368}
- {fileID: 8028545562096509633}
@@ -2355,7 +2433,7 @@
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: 110.49997, y: 8}
+ m_AnchoredPosition: {x: 110.49997, y: 0}
m_SizeDelta: {x: 771.78, y: 500.15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7039667364420051335
@@ -2768,8 +2846,8 @@
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: 126.22757, y: 150.37503}
- m_SizeDelta: {x: 508.0248, y: 25}
+ m_AnchoredPosition: {x: 138.17, y: 140}
+ m_SizeDelta: {x: 484.6534, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5222022644954311827
CanvasRenderer:
@@ -2964,7 +3042,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 2
- m_MaxSize: 20
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
diff --git a/UI/Window/FairyAffinityRechargeGiftActWin.prefab b/UI/Window/FairyAffinityRechargeGiftActWin.prefab
index 21efce5d..16a133f 100644
--- a/UI/Window/FairyAffinityRechargeGiftActWin.prefab
+++ b/UI/Window/FairyAffinityRechargeGiftActWin.prefab
@@ -289,7 +289,7 @@
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 66, y: 22}
+ m_SizeDelta: {x: 66, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5914092706290124947
CanvasRenderer:
@@ -326,7 +326,7 @@
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 22
- m_Alignment: 4
+ m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -384,6 +384,7 @@
- {fileID: 3523189632456868468}
- {fileID: 3306274650879079135}
- {fileID: 2125150961597852803}
+ - {fileID: 5589144677929362863}
- {fileID: 6348261378228742578}
- {fileID: 1525384960939113900}
- {fileID: 590692682429816070}
@@ -394,7 +395,7 @@
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: 110.49997, y: 8}
+ m_AnchoredPosition: {x: 110.49997, y: 0}
m_SizeDelta: {x: 771.78, y: 500.15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1071954323294220487
@@ -573,7 +574,7 @@
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 66, y: 22}
+ m_SizeDelta: {x: 66, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6166017121656997556
CanvasRenderer:
@@ -610,7 +611,7 @@
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 22
- m_Alignment: 4
+ m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -670,7 +671,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 335, y: 20}
+ m_SizeDelta: {x: 335, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4139587561649742218
CanvasRenderer:
@@ -704,9 +705,9 @@
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
m_FontSize: 14
m_FontStyle: 0
- m_BestFit: 0
+ m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 40
+ m_MaxSize: 22
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
@@ -929,6 +930,83 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2644663254101936363
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5589144677929362863}
+ - component: {fileID: 8029309403157879370}
+ - component: {fileID: 2791718909165631275}
+ m_Layer: 0
+ m_Name: ImageEx
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5589144677929362863
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2644663254101936363}
+ 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: 248897355975483364}
+ 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: -279, y: 147}
+ m_SizeDelta: {x: 128, y: 129}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8029309403157879370
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2644663254101936363}
+ m_CullTransparentMesh: 1
+--- !u!114 &2791718909165631275
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2644663254101936363}
+ 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: a5a82afc2cac0e14d9fe2fb82324b78e, 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 &2961572290049928536
GameObject:
m_ObjectHideFlags: 0
@@ -1567,8 +1645,8 @@
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: 31.5, y: 71}
- m_SizeDelta: {x: 333, y: 30}
+ m_AnchoredPosition: {x: 31.499912, y: 67.5}
+ m_SizeDelta: {x: 323.3082, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3821406538014940602
CanvasRenderer:
@@ -1604,7 +1682,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 18
+ m_MaxSize: 20
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -2731,7 +2809,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 87.7}
- m_SizeDelta: {x: 170, y: 35}
+ m_SizeDelta: {x: 179, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6905634048260857906
CanvasRenderer:
@@ -3185,8 +3263,8 @@
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: -0.7173, y: 0.181}
- m_SizeDelta: {x: 133.9498, y: 26.6755}
+ m_AnchoredPosition: {x: 0.4354, y: 1.1546}
+ m_SizeDelta: {x: 146.4834, y: 28.6228}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3462034828498511217
CanvasRenderer:
@@ -3222,7 +3300,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 18
+ m_MaxSize: 22
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
diff --git a/UI/Window/FairyAffinityWin.prefab b/UI/Window/FairyAffinityWin.prefab
index ca310cf..5a5b633 100644
--- a/UI/Window/FairyAffinityWin.prefab
+++ b/UI/Window/FairyAffinityWin.prefab
@@ -31,8 +31,10 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2425923401670304713}
- - {fileID: 4138109268123697035}
- {fileID: 3822701955598106961}
+ - {fileID: 3681253458545772739}
+ - {fileID: 140397631694320624}
+ - {fileID: 4138109268123697035}
- {fileID: 724664300185289165}
- {fileID: 7579373491401988315}
m_Father: {fileID: 0}
@@ -83,7 +85,8 @@
btnClose: {fileID: 4584471925413443581}
tranBottomInfo: {fileID: 3681253458545772739}
txtCheckInCnt: {fileID: 4786501066940635945}
- txtTaskResetTime: {fileID: 3405282665393282187}
+ txtTaskResetTime1: {fileID: 3405282665393282187}
+ txtTaskResetTime2: {fileID: 1119207339528291142}
--- !u!1 &59755349680420187
GameObject:
m_ObjectHideFlags: 0
@@ -118,8 +121,8 @@
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: 0, y: 0}
- m_SizeDelta: {x: 100, y: 36}
+ m_AnchoredPosition: {x: 0, y: 0.6912}
+ m_SizeDelta: {x: 100, y: 75.5944}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1036547304177645938
CanvasRenderer:
@@ -151,11 +154,11 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 18
+ m_FontSize: 24
m_FontStyle: 0
- m_BestFit: 1
+ m_BestFit: 0
m_MinSize: 1
- m_MaxSize: 18
+ m_MaxSize: 24
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -371,8 +374,8 @@
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: 0, y: 0}
- m_SizeDelta: {x: 100, y: 36}
+ m_AnchoredPosition: {x: 0, y: 0.6912}
+ m_SizeDelta: {x: 100, y: 75.5944}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7221763930737700193
CanvasRenderer:
@@ -404,11 +407,11 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 18
+ m_FontSize: 24
m_FontStyle: 0
- m_BestFit: 1
+ m_BestFit: 0
m_MinSize: 0
- m_MaxSize: 18
+ m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -528,8 +531,8 @@
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: 0, y: 0}
- m_SizeDelta: {x: 100, y: 36}
+ m_AnchoredPosition: {x: 0, y: 0.6912}
+ m_SizeDelta: {x: 100, y: 75.5944}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &639510298529197068
CanvasRenderer:
@@ -561,11 +564,11 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 18
+ m_FontSize: 24
m_FontStyle: 0
- m_BestFit: 1
+ m_BestFit: 0
m_MinSize: 1
- m_MaxSize: 18
+ m_MaxSize: 24
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -604,14 +607,16 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 5902637726695379568}
- {fileID: 8795409150316484375}
- {fileID: 8612521563036323953}
- m_Father: {fileID: 3822701955598106961}
+ - {fileID: 1199669915547949704}
+ m_Father: {fileID: 224569497753116438}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: -242.8, y: 134}
- m_SizeDelta: {x: 400, y: 20}
+ m_AnchoredPosition: {x: -176.1123, y: 115.600006}
+ m_SizeDelta: {x: 760, y: 30}
m_Pivot: {x: 1, y: 0}
--- !u!1 &1773642925261122070
GameObject:
@@ -955,8 +960,8 @@
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: -125.00003, y: 0}
- m_SizeDelta: {x: 150, y: 20}
+ m_AnchoredPosition: {x: -257.14, y: -0.5087404}
+ m_SizeDelta: {x: 192, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6054254829372714093
CanvasRenderer:
@@ -992,8 +997,8 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 18
- m_Alignment: 0
+ m_MaxSize: 20
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -1037,8 +1042,8 @@
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: 0, y: 0}
- m_SizeDelta: {x: 100, y: 36}
+ m_AnchoredPosition: {x: 0, y: 0.6912}
+ m_SizeDelta: {x: 100, y: 75.5944}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8011158057473446551
CanvasRenderer:
@@ -1070,11 +1075,11 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 18
+ m_FontSize: 24
m_FontStyle: 0
- m_BestFit: 1
+ m_BestFit: 0
m_MinSize: 1
- m_MaxSize: 18
+ m_MaxSize: 24
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1114,14 +1119,13 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 3681253458545772739}
+ m_Children: []
m_Father: {fileID: 224569497753116438}
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: 61, y: -67.4}
- m_SizeDelta: {x: 1208, y: 616}
+ m_AnchoredPosition: {x: -23, y: -10.9}
+ m_SizeDelta: {x: 1040, y: 503}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1698412643948146212
CanvasRenderer:
@@ -1424,6 +1428,83 @@
m_PixelsPerUnitMultiplier: 1
m_Gray: 0
m_IconKey:
+--- !u!1 &3064767299758899387
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5902637726695379568}
+ - component: {fileID: 4823625702941306872}
+ - component: {fileID: 3145699352443944754}
+ m_Layer: 0
+ m_Name: ImageEx
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5902637726695379568
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3064767299758899387}
+ 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: 3681253458545772739}
+ 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: -18.022, y: -0.50873}
+ m_SizeDelta: {x: 723.9558, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4823625702941306872
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3064767299758899387}
+ m_CullTransparentMesh: 1
+--- !u!114 &3145699352443944754
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3064767299758899387}
+ 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: 6d80a354c82dc114dbced90802bd1a17, 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 &3120647070237264950
GameObject:
m_ObjectHideFlags: 0
@@ -1684,7 +1765,7 @@
- component: {fileID: 7865226510662695674}
- component: {fileID: 3405282665393282187}
m_Layer: 5
- m_Name: txtTaskResetTime
+ m_Name: txtTaskResetTime1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1706,8 +1787,8 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: -0.000061035, y: 0}
- m_SizeDelta: {x: 250, y: 20}
+ m_AnchoredPosition: {x: -36.044, y: 0.0000032783}
+ m_SizeDelta: {x: 705.6619, y: 30}
m_Pivot: {x: 1, y: 0}
--- !u!222 &7865226510662695674
CanvasRenderer:
@@ -1743,8 +1824,8 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 18
- m_Alignment: 2
+ m_MaxSize: 20
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -2564,6 +2645,165 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7844952662266213116
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 140397631694320624}
+ - component: {fileID: 7944862429357435759}
+ - component: {fileID: 4323509612189350102}
+ m_Layer: 0
+ m_Name: ImageEx
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &140397631694320624
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7844952662266213116}
+ 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: 224569497753116438}
+ 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: 455.5, y: -259}
+ m_SizeDelta: {x: 423, y: 232}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7944862429357435759
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7844952662266213116}
+ m_CullTransparentMesh: 1
+--- !u!114 &4323509612189350102
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7844952662266213116}
+ 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: 6d7e3e9f1f695074789798663a336689, 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 &8214729504519032985
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1199669915547949704}
+ - component: {fileID: 7900670817277920458}
+ - component: {fileID: 1119207339528291142}
+ m_Layer: 5
+ m_Name: txtTaskResetTime2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1199669915547949704
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8214729504519032985}
+ 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: 3681253458545772739}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: -0.0000076294}
+ m_SizeDelta: {x: 526.886, y: 30}
+ m_Pivot: {x: 1, y: 0}
+--- !u!222 &7900670817277920458
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8214729504519032985}
+ m_CullTransparentMesh: 1
+--- !u!114 &1119207339528291142
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8214729504519032985}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.96862745, g: 0.96862745, b: 0.96862745, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 10
+ m_MaxSize: 20
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "6\u5929:23:59:00\u540E\u4EFB\u52A1\u91CD\u7F6E"
+ m_IsKey: 0
+ m_KeyName:
+ m_ColorType: 1
--- !u!1 &8504710182705613213
GameObject:
m_ObjectHideFlags: 0
diff --git a/UI/Window/FairyAffinityZhanLingWin.prefab b/UI/Window/FairyAffinityZhanLingWin.prefab
index f29140c..7b0e2c4 100644
--- a/UI/Window/FairyAffinityZhanLingWin.prefab
+++ b/UI/Window/FairyAffinityZhanLingWin.prefab
@@ -548,14 +548,14 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 40
+ m_MaxSize: 20
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u8D85\u503C\u798F\u5229"
+ m_Text: "\u8D85 \u503C \u798F \u5229"
m_IsKey: 1
m_KeyName: Zhanling02
m_ColorType: 7
@@ -672,8 +672,8 @@
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: 152.50006, y: 76.19998}
- m_SizeDelta: {x: 150, y: 50}
+ m_AnchoredPosition: {x: 152.50006, y: 69.6}
+ m_SizeDelta: {x: 100, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4290440908089703308
MonoBehaviour:
@@ -798,8 +798,8 @@
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: -166.08127, y: 132.2}
- m_SizeDelta: {x: 109.7259, y: 20.4597}
+ m_AnchoredPosition: {x: -151.8, y: 122}
+ m_SizeDelta: {x: 150, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7649478421976918063
CanvasRenderer:
@@ -846,6 +846,83 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 0
+--- !u!1 &2753910313110714642
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8409494517094319993}
+ - component: {fileID: 2375943219574198753}
+ - component: {fileID: 5289052650600468550}
+ m_Layer: 0
+ m_Name: ImageEx (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8409494517094319993
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2753910313110714642}
+ 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: 9091965598472578069}
+ 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: 175.05, y: 95.555}
+ m_SizeDelta: {x: 324, y: 43}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2375943219574198753
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2753910313110714642}
+ m_CullTransparentMesh: 1
+--- !u!114 &5289052650600468550
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2753910313110714642}
+ 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: 04ed6a00a1fa5a140b01c0fcce6c842d, 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 &3059241989811608186
GameObject:
m_ObjectHideFlags: 0
@@ -944,8 +1021,8 @@
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: 119.33, y: 109.79}
- m_SizeDelta: {x: 168.3387, y: 12.8205}
+ m_AnchoredPosition: {x: 213.9, y: 95.555}
+ m_SizeDelta: {x: 150, y: 11.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &571887894203870224
CanvasRenderer:
@@ -988,7 +1065,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 200%
+ m_Text: 60000
m_IsKey: 0
m_KeyName:
m_ColorType: 0
@@ -1217,7 +1294,7 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 1
- m_MaxSize: 18
+ m_MaxSize: 20
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1376,8 +1453,8 @@
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: 0.3696, y: 0}
- m_SizeDelta: {x: 132.9147, y: 36}
+ m_AnchoredPosition: {x: -0.00061655045, y: 0}
+ m_SizeDelta: {x: 100, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5266110260064109228
CanvasRenderer:
@@ -1420,7 +1497,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "N\xFAt th\xF4ng d\u1EE5ng"
+ m_Text: "9999\u5143"
m_IsKey: 0
m_KeyName:
m_ColorType: 7
@@ -1612,7 +1689,7 @@
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: -60, y: 197}
+ m_AnchoredPosition: {x: -60, y: 191.20001}
m_SizeDelta: {x: 278, y: 59}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &410343852633781528
@@ -1770,8 +1847,8 @@
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: 126.22757, y: 150.6}
- m_SizeDelta: {x: 508.0248, y: 25}
+ m_AnchoredPosition: {x: 138.17, y: 140}
+ m_SizeDelta: {x: 484.6534, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7416945040180310011
CanvasRenderer:
@@ -2083,8 +2160,8 @@
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: 275.65515, y: 125.60001}
- m_SizeDelta: {x: 209.1698, y: 25}
+ m_AnchoredPosition: {x: 319.9, y: 110}
+ m_SizeDelta: {x: 120, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2439260399045893438
CanvasRenderer:
@@ -2242,8 +2319,8 @@
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: 152.50006, y: 76.2}
- m_SizeDelta: {x: 102, y: 80}
+ m_AnchoredPosition: {x: 152.5, y: 72.272}
+ m_SizeDelta: {x: 81.6718, y: 64.0565}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5466313899894795417
CanvasRenderer:
@@ -2356,14 +2433,14 @@
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
- m_MaxSize: 40
+ m_MaxSize: 20
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u57FA\u7840\u798F\u5229"
+ m_Text: "\u57FA \u7840 \u798F \u5229"
m_IsKey: 1
m_KeyName: Zhanling01
m_ColorType: 7
@@ -2401,6 +2478,7 @@
- {fileID: 2682946443670684501}
- {fileID: 9075837649542350380}
- {fileID: 295331380203901426}
+ - {fileID: 8409494517094319993}
- {fileID: 4671562002157491138}
- {fileID: 6154356045575661881}
- {fileID: 2546429157940600732}
@@ -2414,7 +2492,7 @@
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: 110.500015, y: 8}
+ m_AnchoredPosition: {x: 110.500015, y: 0}
m_SizeDelta: {x: 771.78, y: 500}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6979285709177813079
@@ -3010,8 +3088,8 @@
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: -65.73185, y: 125.6}
- m_SizeDelta: {x: 266.5362, y: 25}
+ m_AnchoredPosition: {x: 35.3, y: 110}
+ m_SizeDelta: {x: 264.6497, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7868656334466487391
CanvasRenderer:
--
Gitblit v1.8.0