ui小修改

Assets/Content/Icons/ActivityImgNew1.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 61a8f13c1abbbd646ae7455240513d90
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/ActivityImgNew1/img_shuang11Signin_cn.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: f27798867dc48ca4182c004e82a8a494
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/ActivityImgNew1/shuang11charge1_cn.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 6317e0370abe39b4095649666e67918b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Prefabs/UI/UIActivity/UIActivityFortnightLogin.prefab

@@ -209,7 +209,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 90, y: -40}
-  m_SizeDelta: {x: 74, y: 80}
+  m_SizeDelta: {x: 75, y: 80}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5775774133583567986
 CanvasRenderer:
@@ -304,6 +304,7 @@ MonoBehaviour:
   - UINode
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1288330801487319876
 GameObject:
@@ -461,6 +462,127 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2250178556336975859
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7090128607979971633}
+  - component: {fileID: 3234724669688900522}
+  - component: {fileID: 2972951451793614893}
+  - component: {fileID: 4831942557624623708}
+  - component: {fileID: 299752443199769593}
+  m_Layer: 5
+  m_Name: CurLoginTxt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7090128607979971633
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2250178556336975859}
+  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: 4100088124785731602}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 100}
+  m_SizeDelta: {x: -300, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3234724669688900522
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2250178556336975859}
+  m_CullTransparentMesh: 1
+--- !u!114 &2972951451793614893
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2250178556336975859}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.33333334, g: 0.36862746, b: 0.454902, 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: 90ed5292e87d8a64aac7038df97ece85, type: 3}
+    m_FontSize: 40
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 4
+    m_MaxSize: 48
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u0412\u0445\u043E\u0434 <color=#FF9600>{0}</color>-\u0439 \u0434\u0435\u043D\u044C
+    \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u0435 <color=#FF9600>{1}</color>"
+--- !u!114 &4831942557624623708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2250178556336975859}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: curLoginTxt
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Text
+  - UINode
+  - UnityEngine.UI.Outline
+  values: 0000010000
+  depObjs: []
+  IsNewNode: 1
+  activeType: 0
+--- !u!114 &299752443199769593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2250178556336975859}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 1, g: 1, b: 1, a: 1}
+  m_EffectDistance: {x: 2, y: -2}
+  m_UseGraphicAlpha: 1
 --- !u!1 &2340892001243189159
 GameObject:
   m_ObjectHideFlags: 0
@@ -620,6 +742,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2764878607990487817
 GameObject:
@@ -736,7 +859,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: 214, y: -40}
+  m_AnchoredPosition: {x: 215, y: -40}
   m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5851747639837583344
@@ -1181,6 +1304,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5185877690595201390
 GameObject:
@@ -1217,6 +1341,7 @@ RectTransform:
   - {fileID: 2135698403620338885}
   - {fileID: 2675368309411793864}
   - {fileID: 5985979696530369344}
+  - {fileID: 7090128607979971633}
   m_Father: {fileID: 3151090880979479083}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1773,7 +1898,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5985979696530369344
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1796,7 +1921,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 80}
-  m_SizeDelta: {x: 0, y: 80}
+  m_SizeDelta: {x: 579, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6415103357067401882
 MonoBehaviour:
@@ -2181,8 +2306,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 264, y: -40}
-  m_SizeDelta: {x: 316, y: 80}
+  m_AnchoredPosition: {x: 265, y: -40}
+  m_SizeDelta: {x: 314, y: 80}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3078565096580051987
 CanvasRenderer:
@@ -2277,6 +2402,7 @@ MonoBehaviour:
   - UINode
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &6545404168248536075
 GameObject:

Assets/Content/Prefabs/UI/UIDojo/UIDojo2D.prefab

@@ -478,6 +478,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &484284092361616038
 GameObject:
@@ -717,6 +718,7 @@ MonoBehaviour:
   - UINode
   values: 0000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &604169070156606587
 GameObject:
@@ -821,6 +823,7 @@ MonoBehaviour:
   - UnityEngine.UI.Outline
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &4124130209110937353
 MonoBehaviour:
@@ -934,6 +937,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &865857300230945961
 GameObject:
@@ -990,6 +994,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &918493045955741720
 GameObject:
@@ -1090,6 +1095,7 @@ MonoBehaviour:
   - UnityEngine.UI.Button
   values: 0000000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2048432108579829642
 MonoBehaviour:
@@ -1388,6 +1394,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1238753600624739697
 GameObject:
@@ -2100,6 +2107,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2302763410734658172
 GameObject:
@@ -2447,6 +2455,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 6157224965281936822}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2487429229064538610
 GameObject:
@@ -2505,6 +2514,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2561350525077319079
 GameObject:
@@ -2567,6 +2577,7 @@ MonoBehaviour:
   - UnityEngine.UI.Image
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!222 &940143751219987203
 CanvasRenderer:
@@ -2739,6 +2750,7 @@ MonoBehaviour:
   - TweenRectTransformPosition
   values: 010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &5627718769591915253
 MonoBehaviour:
@@ -2888,6 +2900,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2868673510988095934
 GameObject:
@@ -3189,6 +3202,7 @@ MonoBehaviour:
   - UINode
   values: 0000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3016158187586197544
 GameObject:
@@ -3310,6 +3324,7 @@ MonoBehaviour:
   - TweenRectTransformPosition
   values: 010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &238146951547425137
 MonoBehaviour:
@@ -3415,6 +3430,7 @@ MonoBehaviour:
   - TweenRectTransformPosition
   values: 010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &205995124678375789
 MonoBehaviour:
@@ -4200,6 +4216,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &4137952953930526503
 GameObject:
@@ -4571,6 +4588,7 @@ MonoBehaviour:
   - UnityEngine.UI.Outline
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &8014679086011576753
 MonoBehaviour:
@@ -4659,9 +4677,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -4690,6 +4708,7 @@ MonoBehaviour:
   - UnityEngine.UI.Outline
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2764409672988232065
 MonoBehaviour:
@@ -4913,6 +4932,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5253422929849686685
 GameObject:
@@ -5092,6 +5112,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5322288593765421808
 GameObject:
@@ -5646,6 +5667,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &5983228406791729870
 MonoBehaviour:
@@ -5818,6 +5840,7 @@ MonoBehaviour:
   - TweenRectTransformPosition
   values: 010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &5072936789163478922
 MonoBehaviour:
@@ -6009,6 +6032,7 @@ MonoBehaviour:
   - TMPro.TextMeshProUGUI
   values: 00000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2280588855425293236
 MonoBehaviour:
@@ -6157,6 +6181,7 @@ MonoBehaviour:
   - TweenRectTransformPosition
   values: 010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2226444021161667006
 MonoBehaviour:
@@ -6674,6 +6699,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &6914965266696582040
 GameObject:
@@ -6776,6 +6802,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7111320037440594090
 GameObject:
@@ -7236,6 +7263,7 @@ MonoBehaviour:
   - UINode
   values: 0000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7469123717332189553
 GameObject:
@@ -7400,6 +7428,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7710149530829885928
 GameObject:
@@ -7698,6 +7727,7 @@ MonoBehaviour:
   - UINode
   values: 000000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8031236061255127554
 GameObject:
@@ -7900,6 +7930,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8471647504145531106
 GameObject:
@@ -8045,6 +8076,7 @@ MonoBehaviour:
   - UINode
   values: 0000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8543127722067204583
 GameObject:
@@ -8309,6 +8341,7 @@ MonoBehaviour:
   - TweenRectTransformPosition
   values: 010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &731248004923001815
 MonoBehaviour:
@@ -8573,6 +8606,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &9015806885753277548
 GameObject:

Assets/Content/Prefabs/UI/UISkillExpBattle/UIEvil.prefab

@@ -394,6 +394,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &721534434495511988
 GameObject:
@@ -602,6 +603,7 @@ MonoBehaviour:
   - UnityEngine.Animator
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &3653232912932550069
 Animator:
@@ -864,6 +866,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1447797341346704186
 GameObject:
@@ -1091,6 +1094,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2734382023651719711
 GameObject:
@@ -1205,7 +1209,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: 162.11, y: -59}
+  m_AnchoredPosition: {x: 162.11, y: -56.5}
   m_SizeDelta: {x: 284.22, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8819853729672122193
@@ -1286,6 +1290,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 1989106635}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2884423999348599702
 GameObject:
@@ -1835,6 +1840,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &7795869257164249280
 MonoBehaviour:
@@ -2086,10 +2092,10 @@ RectTransform:
   m_Father: {fileID: 2558568583545577340}
   m_RootOrder: 4
   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: 27.72, y: 34.15}
-  m_SizeDelta: {x: 162.56, y: 47.69}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 27.720001, y: 36}
+  m_SizeDelta: {x: -125.44, y: -80.31}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2707963559071329782
 CanvasRenderer:
@@ -2160,7 +2166,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 39.25
+  m_fontSize: 40
   m_fontSizeBase: 36
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -2736,6 +2742,7 @@ MonoBehaviour:
   - UINode
   values: 000000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &4856470178805628203
 GameObject:
@@ -2819,6 +2826,7 @@ MonoBehaviour:
   - UIAnimationEvent
   values: 00010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &1662131228252721026
 MonoBehaviour:
@@ -3345,6 +3353,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5772951887155689486
 GameObject:
@@ -3785,6 +3794,7 @@ MonoBehaviour:
   - UnityEngine.UI.Text
   values: 00000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &4091435896685575870
 MonoBehaviour:
@@ -3810,9 +3820,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 36
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 36
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -3965,6 +3975,7 @@ MonoBehaviour:
   - UILocalizeScript
   values: 0000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &931628909483907776
 MonoBehaviour:
@@ -4014,7 +4025,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 46.9
+  m_fontSize: 48
   m_fontSizeBase: 48
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -4301,6 +4312,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7869382053976323467
 GameObject:
@@ -4468,6 +4480,7 @@ MonoBehaviour:
   - UINode
   values: 000000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8082626594947481998
 GameObject:
@@ -4863,6 +4876,7 @@ MonoBehaviour:
   - UINode
   values: 000000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8981928961999393681
 GameObject:
@@ -5002,6 +5016,7 @@ MonoBehaviour:
   - UnityEngine.UI.VerticalLayoutGroup
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &9098797426156415267
 MonoBehaviour:
@@ -5287,6 +5302,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -24.599998
       objectReference: {fileID: 0}
+    - target: {fileID: 3783439950371940756, guid: 4ced2851b471eee42a74c1e35f40d8cf,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 72
+      objectReference: {fileID: 0}
     - target: {fileID: 3783439950371940756, guid: 4ced2851b471eee42a74c1e35f40d8cf,
         type: 3}
       propertyPath: m_textAlignment
@@ -5709,6 +5729,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 2922036580210614482}
+  IsNewNode: 0
   activeType: 0
 --- !u!224 &8458424247601256065 stripped
 RectTransform:
@@ -5876,6 +5897,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!224 &3797534686012227826 stripped
 RectTransform:
@@ -5940,6 +5962,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -24.599998
       objectReference: {fileID: 0}
+    - target: {fileID: 3783439950371940756, guid: 4ced2851b471eee42a74c1e35f40d8cf,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 72
+      objectReference: {fileID: 0}
     - target: {fileID: 3783439950371940756, guid: 4ced2851b471eee42a74c1e35f40d8cf,
         type: 3}
       propertyPath: m_textAlignment
@@ -6555,6 +6582,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -24.599998
       objectReference: {fileID: 0}
+    - target: {fileID: 3783439950371940756, guid: 4ced2851b471eee42a74c1e35f40d8cf,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 72
+      objectReference: {fileID: 0}
     - target: {fileID: 3783439950371940756, guid: 4ced2851b471eee42a74c1e35f40d8cf,
         type: 3}
       propertyPath: m_textAlignment

Assets/Content/Prefabs/UI/UITips/UITips.prefab

@@ -119,6 +119,7 @@ MonoBehaviour:
   - UnityEngine.UI.ContentSizeFitter
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &1173114820442619323
 MonoBehaviour:
@@ -611,6 +612,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 8496751995553779941}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &638089119063365731
 GameObject:
@@ -827,6 +829,7 @@ MonoBehaviour:
   values: 000001000000
   depObjs:
   - {fileID: 7043320812614819791}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &668030599648716055
 GameObject:
@@ -948,6 +951,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 1864908260596172886}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &712597008379751745
 GameObject:
@@ -1008,6 +1012,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &5749634126315494298
 MonoBehaviour:
@@ -1245,6 +1250,7 @@ MonoBehaviour:
   values: 000000010000
   depObjs:
   - {fileID: 7170257878926731557}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &1738490651784211186
 MonoBehaviour:
@@ -1361,6 +1367,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &908800171072668869
 GameObject:
@@ -1523,6 +1530,7 @@ MonoBehaviour:
   values: 000001000000
   depObjs:
   - {fileID: 8727562782146022982}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &929739830813479278
 GameObject:
@@ -1629,6 +1637,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &934839221919810030
 GameObject:
@@ -1775,6 +1784,7 @@ MonoBehaviour:
   - UnityEngine.Animator
   values: 000000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &2301405803629429423
 Animator:
@@ -2007,6 +2017,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1125146633284989855
 GameObject:
@@ -2127,6 +2138,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &4861522012528023281
 Animator:
@@ -2857,6 +2869,7 @@ MonoBehaviour:
   values: 0000000000
   depObjs:
   - {fileID: 7832733812411471615}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6885819584552888626
 MonoBehaviour:
@@ -3107,6 +3120,7 @@ MonoBehaviour:
   - UINode
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1644197921454271421
 GameObject:
@@ -3164,6 +3178,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1646728179104572469
 GameObject:
@@ -3371,6 +3386,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 7170257878926731557}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &9091791182743235741
 MonoBehaviour:
@@ -4194,6 +4210,7 @@ MonoBehaviour:
   - UnityEngine.UI.GraphicRaycaster
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &8855219795525822273
 MonoBehaviour:
@@ -4424,6 +4441,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 2920578063658991211}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2170787677632255670
 GameObject:
@@ -4515,6 +4533,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 8727562782146022982}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2195384777567565312
 GameObject:
@@ -4773,6 +4792,7 @@ MonoBehaviour:
   - UINode
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2232442887417502038
 GameObject:
@@ -5045,6 +5065,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 2920578063658991211}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2424331744736425887
 GameObject:
@@ -5550,6 +5571,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 3618567942269297178}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3020877466715515906
 GameObject:
@@ -5779,6 +5801,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3161055974902758456
 GameObject:
@@ -6016,6 +6039,7 @@ MonoBehaviour:
   - UINode
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3342753415308758324
 GameObject:
@@ -6239,6 +6263,7 @@ MonoBehaviour:
   - UnityEngine.UI.HorizontalLayoutGroup
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &3114260140774969071
 MonoBehaviour:
@@ -6818,6 +6843,7 @@ MonoBehaviour:
   - UnityEngine.UI.ContentSizeFitter
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6082332015603555754
 MonoBehaviour:
@@ -7136,6 +7162,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 255803957712659736}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &9175570608115571707
 MonoBehaviour:
@@ -7466,6 +7493,7 @@ MonoBehaviour:
   - UnityEngine.Animator
   values: 000000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &272313011123037409
 Animator:
@@ -7819,6 +7847,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 2921624887155666246}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &3118266154222939079
 MonoBehaviour:
@@ -7841,6 +7870,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 2921624887155666246}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &4229840175644058040
 GameObject:
@@ -7925,6 +7955,7 @@ MonoBehaviour:
   values: 000000
   depObjs:
   - {fileID: 8727562782146022982}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &4243826666836439936
 GameObject:
@@ -8105,6 +8136,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &7897205702815260459
 MonoBehaviour:
@@ -9218,6 +9250,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &4803846326724600997
 GameObject:
@@ -9584,6 +9617,7 @@ MonoBehaviour:
   values: 000001010000
   depObjs:
   - {fileID: 2921624887155666246}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5129834381071682241
 GameObject:
@@ -10008,6 +10042,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2016819973397186698
 MonoBehaviour:
@@ -10162,6 +10197,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &7331738956136937374
 Animator:
@@ -10472,6 +10508,7 @@ MonoBehaviour:
   - UINode
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5514916323396668851
 GameObject:
@@ -10766,6 +10803,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 8990677121984430512}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5584509154880937814
 GameObject:
@@ -10945,6 +10983,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5615479453181800055
 GameObject:
@@ -11044,6 +11083,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 8990677121984430512}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5717492143469210848
 GameObject:
@@ -11232,6 +11272,7 @@ MonoBehaviour:
   - UINode
   values: 000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5833476054543972460
 GameObject:
@@ -11623,6 +11664,7 @@ MonoBehaviour:
   - UINode
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5949519662602165657
 GameObject:
@@ -12283,6 +12325,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 8727562782146022982}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &6377340111750078854
 GameObject:
@@ -12714,6 +12757,7 @@ MonoBehaviour:
   values: 000001000000
   depObjs:
   - {fileID: 1864908260596172886}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6942645984975007209
 MonoBehaviour:
@@ -13184,6 +13228,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &6693582152287258892
 Animator:
@@ -13480,6 +13525,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7027933092237548804
 GameObject:
@@ -13642,6 +13688,7 @@ MonoBehaviour:
   values: 000001000000
   depObjs:
   - {fileID: 8727562782146022982}
+  IsNewNode: 0
   activeType: 2
 --- !u!1 &7080608366922659695
 GameObject:
@@ -13882,6 +13929,7 @@ MonoBehaviour:
   - UnityEngine.UI.ContentSizeFitter
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &8929698541989986734
 MonoBehaviour:
@@ -14110,6 +14158,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 7043320812614819791}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2360412626117868229
 MonoBehaviour:
@@ -14223,6 +14272,7 @@ MonoBehaviour:
   - UnityEngine.UI.ContentSizeFitter
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &3448266790084353333
 MonoBehaviour:
@@ -14368,6 +14418,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 8311691977094672394}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &7869516069850480413
 MonoBehaviour:
@@ -14527,8 +14578,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -70}
-  m_SizeDelta: {x: 400, y: 0}
+  m_AnchoredPosition: {x: 350, y: -70}
+  m_SizeDelta: {x: 700, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9070722995359258316
 MonoBehaviour:
@@ -14550,7 +14601,7 @@ MonoBehaviour:
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 400, y: 50}
+  m_CellSize: {x: 700, y: 50}
   m_Spacing: {x: 0, y: 0}
   m_Constraint: 1
   m_ConstraintCount: 1
@@ -14589,6 +14640,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 6209523073373075511}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7731012351666373171
 GameObject:
@@ -14672,6 +14724,7 @@ MonoBehaviour:
   - UIAnimationEvent
   values: 00010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &5820483564690773116
 MonoBehaviour:
@@ -14940,6 +14993,7 @@ MonoBehaviour:
   - UnityEngine.UI.ContentSizeFitter
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &849503188758994638
 MonoBehaviour:
@@ -15273,6 +15327,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &961011159347294285
 Animator:
@@ -15489,6 +15544,7 @@ MonoBehaviour:
   values: 0000000100
   depObjs:
   - {fileID: 8990677121984430512}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &8687699845321813827
 MonoBehaviour:
@@ -15642,6 +15698,7 @@ MonoBehaviour:
   values: 000001010000
   depObjs:
   - {fileID: 8555734468395854631}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8498622465860936523
 GameObject:
@@ -15715,6 +15772,7 @@ MonoBehaviour:
   - UnityEngine.UI.ContentSizeFitter
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &7032218135344405776
 MonoBehaviour:
@@ -15854,6 +15912,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 1340728856}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8608311580164541679
 GameObject:
@@ -16051,6 +16110,7 @@ MonoBehaviour:
   values: 000001000000
   depObjs:
   - {fileID: 8727562782146022982}
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &8494067324426506421
 Animator:
@@ -16444,6 +16504,7 @@ MonoBehaviour:
   values: 0000000000
   depObjs:
   - {fileID: 8151894651014578497}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &296847639519268256
 MonoBehaviour:
@@ -16597,6 +16658,7 @@ MonoBehaviour:
   values: 000000010000
   depObjs:
   - {fileID: 255803957712659736}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8991793049746619159
 GameObject:
@@ -16717,6 +16779,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &5827057107903168254
 Animator:
@@ -16939,6 +17002,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 8555734468395854631}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6251296186236201236
 MonoBehaviour:
@@ -17040,7 +17104,12 @@ PrefabInstance:
     - target: {fileID: 14532477887240790, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 69131081454360664, guid: b36ea122c84dd3f479ae9c35fd3c051d,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 112
       objectReference: {fileID: 0}
     - target: {fileID: 6765649501214168865, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
@@ -17075,7 +17144,7 @@ PrefabInstance:
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
@@ -17085,7 +17154,7 @@ PrefabInstance:
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
@@ -17095,7 +17164,7 @@ PrefabInstance:
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 50
       objectReference: {fileID: 0}
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
@@ -17135,12 +17204,12 @@ PrefabInstance:
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 370
       objectReference: {fileID: 0}
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -535
       objectReference: {fileID: 0}
     - target: {fileID: 7625732548870835287, guid: b36ea122c84dd3f479ae9c35fd3c051d,
         type: 3}

Assets/Lua/Config/ActivitiesCfg.lua

@@ -1917,8 +1917,8 @@ local ActivitiesCfg = {
 ['Type']=12,
 ['Name']='ActCfg_Name134',
 ['Order']=1,
-['BG']='ActivityImg/shuang11charge1_cn',
-['ActivityBG']='ActivityImg/shuang11charge1_cn',
+['BG']='ActivityImgNew1/shuang11charge1_cn',
+['ActivityBG']='ActivityImgNew1/shuang11charge1_cn',
 ['PageId']=335,
 ['Entrance']={159},
 ['NeedShow']=true,
@@ -1959,8 +1959,8 @@ local ActivitiesCfg = {
 ['Type']=4,
 ['Name']='ActCfg_Name137',
 ['Order']=2,
-['BG']='ActivityImg/shuang11Signin_cn',
-['ActivityBG']='ActivityImg/img_shuang11Signin_cn',
+['BG']='ActivityImgNew1/img_shuang11Signin_cn',
+['ActivityBG']='ActivityImgNew1/img_shuang11Signin_cn',
 ['PageId']=304,
 ['Entrance']={159},
 ['NeedShow']=true,

Assets/Lua/Config/ActivitiesFortnightOnlineCfg.lua

@@ -777,7 +777,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [84]={
 ['Id']=84,
-['Rewards']={{12338,1}},
+['Rewards']={{13190,1}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=137,

Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -6998,7 +6998,7 @@ local ActivitiesTaskCfg = {
     [636]={
     ['TaskId']=636,
     ['TaskCondition']={{60,20000}},
-    ['Reward']={{12187,1},{12186,1},{15046,2},{268,15}},
+    ['Reward']={{15111,1},{12186,1},{15046,2},{268,15}},
     ['Title']='ATCfg_Title_690',
     ['Desc']='',
     ['GoPageId']=117,

Assets/Lua/UI/UIActivity/UIActivityFortnightLoginView.lua

@@ -21,6 +21,8 @@ function UIActivityFortnightLoginView:FillContent(data, uiBase)
 	end
 	self:InitGenerate(self.transform, data)
 	self.curRewardName.text.text =""
+	self.curRewardTxt =""
+	self.curDayStr = ""
 	self:Init()
 end
 
@@ -70,7 +72,8 @@ end
 function UIActivityFortnightLoginView:RefreshActData()
 	local activityItem = self.controller:GetActivityData()
 	if activityItem ~= nil then
-		self.curDayTxt.text.text = activityItem.curDay .." ".. I18N.T("Day")
+		--self.curDayTxt.text.text = activityItem.curDay .." ".. I18N.T("Day")
+		self.curDayStr = tostring(activityItem.curDay)
 		local data = activityItem:GetActivityData()
 		local maxDayData = 0
 		
@@ -87,10 +90,12 @@ function UIActivityFortnightLoginView:RefreshActData()
 		end
 
 		if activityItem.curDay > maxDayData  and maxItemCfg then
-			self.curRewardName.text.text = I18N.T(maxItemCfg.Name)
-			self.curDayTxt.text.text = maxDayData .. I18N.T("Day")
+			--self.curRewardName.text.text = I18N.T(maxItemCfg.Name)
+			--self.curDayTxt.text.text = maxDayData .. I18N.T("Day")
+			self.curRewardTxt =I18N.T(maxItemCfg.Name)
+			self.curDayStr = tostring(maxDayData)
 		end 
-
+		self.curLoginTxt.text.text = I18N.SetLanguageValue("signinTxt",self.curDayStr,self.curRewardTxt)
 	end
 end
 
@@ -126,7 +131,8 @@ function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,cur
 		rewardItemLua.iconItem.bg.button.interactable = false
 		itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData)
 		if itemData.day == curDay then
-			self.curRewardName.text.text = I18N.T(itemCfg.Name)
+			--self.curRewardName.text.text = I18N.T(itemCfg.Name)
+			self.curRewardTxt =I18N.T(itemCfg.Name)
 		end
 	elseif itemData.isOutdate then
 		rewardItemLua.gotRewardNode:SetActive(false)
@@ -143,14 +149,15 @@ function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,cur
 			rewardItemLua.shad:SetActive(false)
 			itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData, nil, self, self.OnClickGetReward,itemData.day)
 			if itemData.day == curDay then
-				self.curRewardName.text.text = I18N.T(itemCfg.Name)
+				--self.curRewardName.text.text = I18N.T(itemCfg.Name)
+				self.curRewardTxt =I18N.T(itemCfg.Name)
 			end
 		else
 			IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData, nil, self, self.OnClickItem)
 			rewardItemLua.shad:SetActive(true)
 		end
 	end
-
+	self.curLoginTxt.text.text = I18N.SetLanguageValue("signinTxt",self.curDayStr,self.curRewardTxt)
 	rewardItemLua.iconItem.redPoint:SetActive(itemData.isFinished and (not itemData.isOutdate) and (not itemData.isGotReward))
 	return itemCfg
 end

Assets/Lua/UI/UIActivity/UIActivityFortnightLoginView_Generate.lua

@@ -2,6 +2,10 @@
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
 
+---@class UIActivityFortnightLogin__Generate_curLoginTxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text UnityEngine.UI.Text
+
 ---@class UIActivityFortnightLogin__Generate_curRewardName
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text UnityEngine.UI.Text
@@ -32,6 +36,7 @@
 ---@field private image UIActivityFortnightLogin__Generate_image
 ---@field private curDayTxt UIActivityFortnightLogin__Generate_curDayTxt
 ---@field private curRewardName UIActivityFortnightLogin__Generate_curRewardName
+---@field private curLoginTxt UIActivityFortnightLogin__Generate_curLoginTxt
 ---@field private backBtn UIActivityFortnightLogin__Generate_backBtn
 local UIActivityFortnightLoginView = class("UIActivityFortnightLoginView", require("UIViewBase"))
 
@@ -59,6 +64,7 @@ function UIActivityFortnightLoginView:InitGenerate(Root, data)
 	self:InitGenerate__5(Root,data)
 	self:InitGenerate__6(Root,data)
 	self:InitGenerate__7(Root,data)
+	self:InitGenerate__8(Root,data)
 
 
 end
@@ -150,6 +156,26 @@ end
 
 ---@private
 function UIActivityFortnightLoginView:InitGenerate__7(Root, data)
+--[[
+	UIAnimator/Window/Baner/CurLoginTxt
+--]]
+	local tmp = nil
+	local tfm = Root:Find("UIAnimator/Window/Baner/CurLoginTxt")
+	if tfm == nil then
+		return
+	else
+		tmp = tfm.gameObject
+	end
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.curLoginTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+end
+
+---@private
+function UIActivityFortnightLoginView:InitGenerate__8(Root, data)
 --[[
 	UIAnimator/Window/BtnBack
 --]]
@@ -191,6 +217,10 @@ function UIActivityFortnightLoginView:GenerateDestroy()
 		tolua.setpeer(self.curRewardName, nil)
 	end
 	self.curRewardName = nil
+	if tolua.getpeer(self.curLoginTxt) ~= nil then
+		tolua.setpeer(self.curLoginTxt, nil)
+	end
+	self.curLoginTxt = nil
 	if tolua.getpeer(self.backBtn) ~= nil then
 		tolua.setpeer(self.backBtn, nil)
 	end

Assets/Lua/UI/UIExpedition/UIExpeditionBattleView.lua

@@ -52,7 +52,7 @@ function UIExpeditionBattleView:Init()
 
 	local mapData = ManagerContainer.DataMgr.ExpeditionDataMgr:CurChallengingMap()
 	if mapData ~= nil then
-		self.mapName.text.text = mapData.name
+		self.mapName.text.text = I18N.T(mapData.name)
 		self.curLevel.text.text = tostring(ManagerContainer.DataMgr.ExpeditionDataMgr:GetCurLevelId()) .. "/" .. mapData.maxLevelNum
 	end
 end