diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang01.png b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang01.png
new file mode 100644
index 0000000000..6da4810549
Binary files /dev/null and b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang01.png differ
diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang01.png.meta b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang01.png.meta
new file mode 100644
index 0000000000..966ecf55be
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang01.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: 66bbab0812b3c0c47849ca9e06509e53
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ 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
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 79fbfbff138bedf468b0e97864cc06f5
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: PracticeAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang02.png b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang02.png
new file mode 100644
index 0000000000..433f06e0a1
Binary files /dev/null and b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang02.png differ
diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang02.png.meta b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang02.png.meta
new file mode 100644
index 0000000000..2a80908687
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_tanchuang02.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: 82aaf1fe8062cf0459589dabb1f43172
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ 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
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 69e50278234736f47b005e64eca12e11
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: PracticeAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 646fb5aa11..eea466fc11 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -411,7 +411,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: 450, y: -164}
+ m_AnchoredPosition: {x: 350, y: -169}
m_SizeDelta: {x: 600, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3596436011982854297
@@ -434,10 +434,10 @@ MonoBehaviour:
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
- m_CellSize: {x: 600, y: 35}
- m_Spacing: {x: 0, y: 0}
+ m_CellSize: {x: 350, y: 35}
+ m_Spacing: {x: 100, y: 0}
m_Constraint: 1
- m_ConstraintCount: 1
+ m_ConstraintCount: 2
--- !u!114 &8803359895495548047
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1988,7 +1988,6 @@ GameObject:
m_Component:
- component: {fileID: 1126952660353491259}
- component: {fileID: 4827792396798163766}
- - component: {fileID: 2890818643573246769}
- component: {fileID: 5050479793497493233}
- component: {fileID: 4330992986176314469}
m_Layer: 0
@@ -2019,7 +2018,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1658, y: -1052}
- m_SizeDelta: {x: 900, y: 184}
+ m_SizeDelta: {x: 900, y: 189}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4827792396798163766
CanvasRenderer:
@@ -2029,35 +2028,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1422192717058822037}
m_CullTransparentMesh: 0
---- !u!114 &2890818643573246769
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1422192717058822037}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.56078434}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 0}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
--- !u!114 &5050479793497493233
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2071,12 +2041,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: 0
+ m_Left: 50
m_Right: 0
- m_Top: 20
+ m_Top: 90
m_Bottom: 20
- m_ChildAlignment: 4
- m_Spacing: 0
+ m_ChildAlignment: 0
+ m_Spacing: 10
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@@ -3008,6 +2978,86 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u67E5\u770B\u8BE6\u60C5"
+--- !u!1 &2720443698035672157
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8801431042592175382}
+ - component: {fileID: 1911486479183066866}
+ - component: {fileID: 1541755853711067320}
+ m_Layer: 0
+ m_Name: num
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8801431042592175382
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2720443698035672157}
+ 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_Children: []
+ m_Father: {fileID: 5099785980946439771}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1911486479183066866
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2720443698035672157}
+ m_CullTransparentMesh: 0
+--- !u!114 &1541755853711067320
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2720443698035672157}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.9529412, g: 0.9019608, b: 0.80784315, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 50
+ m_Alignment: 5
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: +3000
+ LanguageIndex: 0
--- !u!1 &2756625957159874447
GameObject:
m_ObjectHideFlags: 0
@@ -3776,8 +3826,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchoredPosition: {x: -364.6, y: 0}
+ m_SizeDelta: {x: -774.9, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7052788287217176819
CanvasRenderer:
@@ -3800,7 +3850,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.97647065, g: 0.7607844, b: 0.5058824, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -3814,7 +3864,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
- m_Alignment: 4
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -3931,8 +3981,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: 450, y: -130.5}
- m_SizeDelta: {x: 600, y: 67}
+ m_AnchoredPosition: {x: 350, y: -124.5}
+ m_SizeDelta: {x: 600, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &158801954867338518
CanvasRenderer:
@@ -3955,7 +4005,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 1, g: 0.84705883, b: 0.5803922, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -7672,6 +7722,7 @@ GameObject:
- component: {fileID: 4250835300878011901}
- component: {fileID: 344073511819279971}
- component: {fileID: 8227652277031025722}
+ - component: {fileID: 8248118254467204345}
m_Layer: 0
m_Name: title
m_TagString: Untagged
@@ -7696,8 +7747,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: 450, y: -58.5}
- m_SizeDelta: {x: 184, y: 77}
+ m_AnchoredPosition: {x: 455.5, y: -39}
+ m_SizeDelta: {x: 911, y: 78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &344073511819279971
CanvasRenderer:
@@ -7727,7 +7778,101 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: ada70478cb00b4d41b6449d95256316a, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 66bbab0812b3c0c47849ca9e06509e53, 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
+--- !u!114 &8248118254467204345
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7275972870704052744}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 1
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: -1
+ m_PreferredHeight: -1
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
+--- !u!1 &7476382815009405496
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6361392426091645034}
+ - component: {fileID: 8553695436892527098}
+ - component: {fileID: 2967782855072496991}
+ m_Layer: 0
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6361392426091645034
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7476382815009405496}
+ 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_Children: []
+ m_Father: {fileID: 5099785980946439771}
+ m_RootOrder: 0
+ 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: 0.5}
+ m_SizeDelta: {x: 0, y: 1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8553695436892527098
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7476382815009405496}
+ m_CullTransparentMesh: 0
+--- !u!114 &2967782855072496991
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7476382815009405496}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 82aaf1fe8062cf0459589dabb1f43172, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -8910,14 +9055,16 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -93.25}
m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
+ m_Children:
+ - {fileID: 6361392426091645034}
+ - {fileID: 8801431042592175382}
m_Father: {fileID: 9061013164573287848}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 300, y: -25}
- m_SizeDelta: {x: 600, y: 50}
+ m_AnchoredPosition: {x: 175, y: -17.5}
+ m_SizeDelta: {x: 350, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7901625351890239395
CanvasRenderer:
@@ -8940,7 +9087,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9529412, g: 0.7176471, b: 0.30980393, a: 1}
+ m_Color: {r: 0.9529412, g: 0.9019608, b: 0.80784315, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -8960,7 +9107,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u540D\u79F0\u664B\u5347\u4E3A\u7EFF\u8272\\n\u89E3\u9501\u7B51\u57FA\u671F"
+ m_Text: "\u5168\u4F53\u795E\u5C06\u751F\u547D"
LanguageIndex: 0
--- !u!1 &8928638864674883989
GameObject:
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
index cf1cf29ee5..b25bc70a26 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
@@ -78,11 +78,14 @@ function PracticeStatePreview:SetSingleData(index,_go,_data)
singleTextList[i].transform.localPosition = Vector3.zero
end
local Text = singleTextList[i]:GetComponent("Text")
- local string = PracticeManager.GetPreviewSingleText(templist[i].id,templist[i].value)
+ local num = Util.GetGameObject(singleTextList[i],"num"):GetComponent("Text")
+ local string,string2 = PracticeManager.GetPreviewSingleText(templist[i].id,templist[i].value)
singleTextList[i]:SetActive(true)
Text.text = string
+ num.text = string2
if _data.IsActive then
Text.text = string.format("%s",string)
+ num.text = string.format("%s",string2)
end
end
specialText.text = _data.RealmDesc
diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
index 45d0315080..77a77e6b84 100644
--- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
@@ -156,9 +156,9 @@ end
--返回预览界面文字
function this.GetPreviewSingleText(id,value)
if PropertyConfig[id].Style == 1 then
- return string.format("全体神将%s+%s",PropertyConfig[id].Info,value)
+ return string.format("全体神将%s",PropertyConfig[id].Info),string.format("+%s",value)
elseif PropertyConfig[id].Style == 2 then
- return string.format("全体神将%s+%s",PropertyConfig[id].Info,value).."%"
+ return string.format("全体神将%s",PropertyConfig[id].Info),string.format("+%s",value).."%"
end
end