diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab
index 3bbd8ef4be..eee7cfc5bd 100644
--- a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &102950517810623577
+--- !u!1 &808074453642744946
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,199 +8,69 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 3678117272082407570}
- - component: {fileID: 807919696737720876}
+ - component: {fileID: 7091551423015276754}
+ - component: {fileID: 7993208164480339922}
+ - component: {fileID: 8918234484474973161}
m_Layer: 5
- m_Name: Image
+ m_Name: upStarSkillTextPre3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &3678117272082407570
+--- !u!224 &7091551423015276754
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 102950517810623577}
- 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:
- - {fileID: 3217427705450324081}
- m_Father: {fileID: 6483924622460555338}
- 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: 46.6, y: -16.7}
- m_SizeDelta: {x: 66.8, y: 33.4}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &807919696737720876
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 102950517810623577}
- m_CullTransparentMesh: 0
---- !u!1 &229830674412618124
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 394762473653661060}
- - component: {fileID: 5260277484931087363}
- - component: {fileID: 5867251702624618044}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &394762473653661060
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 229830674412618124}
- 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: 1199933653745891110}
- m_RootOrder: 0
- 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: 3, y: 0.0000052452}
- m_SizeDelta: {x: 280.5, y: 63.4}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5260277484931087363
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 229830674412618124}
- m_CullTransparentMesh: 0
---- !u!114 &5867251702624618044
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 229830674412618124}
- 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: 288461e87c49b6d4eb6b055d683d345c, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!1 &269502601322445380
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6418497370683569385}
- - component: {fileID: 8337152767675042925}
- - component: {fileID: 7104415903127649304}
- m_Layer: 5
- m_Name: upStarSkillTextPre (4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6418497370683569385
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 269502601322445380}
+ m_GameObject: {fileID: 808074453642744946}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 200}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 8056039579428868941}
+ - {fileID: 4119498240399747933}
+ - {fileID: 8722104400795156456}
m_Father: {fileID: 3760028542271038676}
- m_RootOrder: 5
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
---- !u!222 &8337152767675042925
+--- !u!222 &7993208164480339922
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 269502601322445380}
+ m_GameObject: {fileID: 808074453642744946}
m_CullTransparentMesh: 0
---- !u!114 &7104415903127649304
+--- !u!114 &8918234484474973161
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 269502601322445380}
+ m_GameObject: {fileID: 808074453642744946}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.7254902, g: 0.6745098, b: 0.5921569, a: 1}
- m_RaycastTarget: 0
- 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 38
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 1
- m_MaxSize: 50
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 1
- m_LineSpacing: 1.1
- m_Text: "\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n"
- LanguageIndex: 11582
---- !u!1 &484170352235320050
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+--- !u!1 &1238044500234511987
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -208,50 +78,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5893303447916350522}
- - component: {fileID: 8875205452004269322}
- - component: {fileID: 2641365475715316163}
- m_Layer: 5
- m_Name: Text
+ - component: {fileID: 8589933758033001399}
+ - component: {fileID: 3542707872453012322}
+ - component: {fileID: 7169021650401876014}
+ m_Layer: 0
+ m_Name: attri
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5893303447916350522
+--- !u!224 &8589933758033001399
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 484170352235320050}
- 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_GameObject: {fileID: 1238044500234511987}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
m_Children: []
- m_Father: {fileID: 5691846046850870240}
+ m_Father: {fileID: 8408416685914430228}
m_RootOrder: 0
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: 92, y: 0}
- m_SizeDelta: {x: 160, y: 30}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 263.5, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8875205452004269322
+--- !u!222 &3542707872453012322
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 484170352235320050}
+ m_GameObject: {fileID: 1238044500234511987}
m_CullTransparentMesh: 0
---- !u!114 &2641365475715316163
+--- !u!114 &7169021650401876014
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 484170352235320050}
+ m_GameObject: {fileID: 1238044500234511987}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -272,13 +142,13 @@ MonoBehaviour:
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 42
- m_Alignment: 4
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u795E\u5C06\u7B49\u7EA7\uFF1A"
+ m_Text: "\u6CD5\u5B9D\u7B49\u7EA7\uFF1A"
LanguageIndex: 11583
--- !u!1 &1271948007079615894
GameObject:
@@ -397,6 +267,76 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &2215096174708485460
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8408416685914430228}
+ - component: {fileID: 7348625264848791448}
+ - component: {fileID: 1375588516323493434}
+ m_Layer: 5
+ m_Name: upStarSkillTextPre5
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8408416685914430228
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2215096174708485460}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 200}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 8589933758033001399}
+ - {fileID: 4486534862433315041}
+ m_Father: {fileID: 3760028542271038676}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &7348625264848791448
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2215096174708485460}
+ m_CullTransparentMesh: 0
+--- !u!114 &1375588516323493434
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2215096174708485460}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
--- !u!1 &2229381927700078099
GameObject:
m_ObjectHideFlags: 0
@@ -426,14 +366,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 394762473653661060}
- {fileID: 6254254329316534473}
m_Father: {fileID: 3760028542271038676}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: -44.1}
+ m_AnchoredPosition: {x: -0.000022888184, y: -44.099945}
m_SizeDelta: {x: 458.7, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6250796320860987178
@@ -464,7 +403,7 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
---- !u!1 &2623405835479264494
+--- !u!1 &2636835647214252685
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -472,43 +411,148 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5691846046850870240}
- - component: {fileID: 7475224253807422013}
- m_Layer: 5
- m_Name: Image
+ - component: {fileID: 8722104400795156456}
+ - component: {fileID: 4370831949465518850}
+ - component: {fileID: 4099645028532035301}
+ m_Layer: 0
+ m_Name: content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5691846046850870240
+--- !u!224 &8722104400795156456
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2623405835479264494}
- 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:
- - {fileID: 5893303447916350522}
- m_Father: {fileID: 1236357966149142646}
- m_RootOrder: 0
+ m_GameObject: {fileID: 2636835647214252685}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+ m_Children: []
+ m_Father: {fileID: 7091551423015276754}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 46.6, y: -16.7}
- m_SizeDelta: {x: 66.8, y: 33.4}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 399.7, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7475224253807422013
+--- !u!222 &4370831949465518850
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2623405835479264494}
+ m_GameObject: {fileID: 2636835647214252685}
m_CullTransparentMesh: 0
+--- !u!114 &4099645028532035301
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2636835647214252685}
+ 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.7254902, g: 0.6745098, b: 0.5921569, a: 1}
+ m_RaycastTarget: 0
+ 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 38
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 1
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1.1
+ m_Text: "\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566"
+ LanguageIndex: 11582
+--- !u!1 &2696171850932623719
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3309088958550349775}
+ - component: {fileID: 5820211472579249185}
+ - component: {fileID: 1218903645350245973}
+ m_Layer: 5
+ m_Name: upStarSkillTextPre1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3309088958550349775
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2696171850932623719}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 200}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 4986900010167772366}
+ - {fileID: 964532597798700942}
+ m_Father: {fileID: 3760028542271038676}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5820211472579249185
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2696171850932623719}
+ m_CullTransparentMesh: 0
+--- !u!114 &1218903645350245973
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2696171850932623719}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
--- !u!1 &3197130207524255008
GameObject:
m_ObjectHideFlags: 0
@@ -541,11 +585,11 @@ RectTransform:
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 1199933653745891110}
- - {fileID: 1236357966149142646}
- - {fileID: 4164959545876439772}
- - {fileID: 6483924622460555338}
- - {fileID: 918155736618676138}
- - {fileID: 6418497370683569385}
+ - {fileID: 3309088958550349775}
+ - {fileID: 2283184035429657650}
+ - {fileID: 7091551423015276754}
+ - {fileID: 6221757196095462700}
+ - {fileID: 8408416685914430228}
m_Father: {fileID: 6253576317638831237}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -628,7 +672,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
---- !u!1 &3306378148285417514
+--- !u!1 &3523313306843452600
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -636,95 +680,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5314222836333851683}
- - component: {fileID: 4162012737210176578}
- m_Layer: 5
- m_Name: Image
+ - component: {fileID: 4986900010167772366}
+ - component: {fileID: 3357516620502687916}
+ - component: {fileID: 4136953187955600822}
+ m_Layer: 0
+ m_Name: attri
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5314222836333851683
+--- !u!224 &4986900010167772366
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3306378148285417514}
- 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:
- - {fileID: 684491811494771332}
- m_Father: {fileID: 918155736618676138}
- 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: 46.6, y: -16.7}
- m_SizeDelta: {x: 66.8, y: 33.4}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4162012737210176578
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3306378148285417514}
- m_CullTransparentMesh: 0
---- !u!1 &3951141431394152295
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 684491811494771332}
- - component: {fileID: 1672815790272902159}
- - component: {fileID: 6774757699070319717}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &684491811494771332
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3951141431394152295}
- 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_GameObject: {fileID: 3523313306843452600}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
m_Children: []
- m_Father: {fileID: 5314222836333851683}
+ m_Father: {fileID: 3309088958550349775}
m_RootOrder: 0
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: 92, y: 0}
- m_SizeDelta: {x: 160, y: 30}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 263.5, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1672815790272902159
+--- !u!222 &3357516620502687916
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3951141431394152295}
+ m_GameObject: {fileID: 3523313306843452600}
m_CullTransparentMesh: 0
---- !u!114 &6774757699070319717
+--- !u!114 &4136953187955600822
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3951141431394152295}
+ m_GameObject: {fileID: 3523313306843452600}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -745,15 +744,15 @@ MonoBehaviour:
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 42
- m_Alignment: 4
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u7075\u5B9D\u5F3A\u5316\uFF1A"
+ m_Text: "\u795E\u5C06\u7B49\u7EA7\uFF1A"
LanguageIndex: 11583
---- !u!1 &3959411297856787089
+--- !u!1 &3665873054610529366
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -761,50 +760,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6272267927335290013}
- - component: {fileID: 1407651404485008132}
- - component: {fileID: 70667852589333799}
- m_Layer: 5
- m_Name: Text
+ - component: {fileID: 9069950853308930063}
+ - component: {fileID: 6469800861524046041}
+ - component: {fileID: 7817540024467237915}
+ m_Layer: 0
+ m_Name: attri
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &6272267927335290013
+--- !u!224 &9069950853308930063
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3959411297856787089}
- 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_GameObject: {fileID: 3665873054610529366}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
m_Children: []
- m_Father: {fileID: 6787766119249298228}
+ m_Father: {fileID: 2283184035429657650}
m_RootOrder: 0
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: 92, y: 0}
- m_SizeDelta: {x: 160, y: 30}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 263.5, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1407651404485008132
+--- !u!222 &6469800861524046041
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3959411297856787089}
+ m_GameObject: {fileID: 3665873054610529366}
m_CullTransparentMesh: 0
---- !u!114 &70667852589333799
+--- !u!114 &7817540024467237915
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3959411297856787089}
+ m_GameObject: {fileID: 3665873054610529366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -825,7 +824,7 @@ MonoBehaviour:
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 42
- m_Alignment: 4
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -833,7 +832,7 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u88C5\u5907\u54C1\u7EA7\uFF1A"
LanguageIndex: 11583
---- !u!1 &4297295046655270040
+--- !u!1 &4346595897889252443
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -841,44 +840,79 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6787766119249298228}
- - component: {fileID: 2860101570167774539}
- m_Layer: 5
- m_Name: Image
+ - component: {fileID: 2087683102881489736}
+ - component: {fileID: 4289249661576526784}
+ - component: {fileID: 2638539488929137175}
+ m_Layer: 0
+ m_Name: content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &6787766119249298228
+--- !u!224 &2087683102881489736
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4297295046655270040}
- 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:
- - {fileID: 6272267927335290013}
- m_Father: {fileID: 4164959545876439772}
- m_RootOrder: 0
+ m_GameObject: {fileID: 4346595897889252443}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+ m_Children: []
+ m_Father: {fileID: 2283184035429657650}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 46.6, y: -16.7}
- m_SizeDelta: {x: 66.8, y: 33.4}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 399.7, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2860101570167774539
+--- !u!222 &4289249661576526784
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4297295046655270040}
+ m_GameObject: {fileID: 4346595897889252443}
m_CullTransparentMesh: 0
---- !u!1 &4590389038061187354
+--- !u!114 &2638539488929137175
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4346595897889252443}
+ 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.7254902, g: 0.6745098, b: 0.5921569, a: 1}
+ m_RaycastTarget: 0
+ 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 38
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 1
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1.1
+ m_Text: "\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566"
+ LanguageIndex: 11582
+--- !u!1 &4614911911594140926
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -886,28 +920,29 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 918155736618676138}
- - component: {fileID: 4339760687712512230}
- - component: {fileID: 6494144214186784983}
+ - component: {fileID: 6221757196095462700}
+ - component: {fileID: 4305345342487168282}
+ - component: {fileID: 2946370498179239190}
m_Layer: 5
- m_Name: upStarSkillTextPre (3)
+ m_Name: upStarSkillTextPre4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &918155736618676138
+--- !u!224 &6221757196095462700
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4590389038061187354}
+ m_GameObject: {fileID: 4614911911594140926}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 200}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 5314222836333851683}
+ - {fileID: 6973272449204648427}
+ - {fileID: 504521069445950745}
m_Father: {fileID: 3760028542271038676}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -916,50 +951,38 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
---- !u!222 &4339760687712512230
+--- !u!222 &4305345342487168282
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4590389038061187354}
+ m_GameObject: {fileID: 4614911911594140926}
m_CullTransparentMesh: 0
---- !u!114 &6494144214186784983
+--- !u!114 &2946370498179239190
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4590389038061187354}
+ m_GameObject: {fileID: 4614911911594140926}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.7254902, g: 0.6745098, b: 0.5921569, a: 1}
- m_RaycastTarget: 0
- 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 38
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 1
- m_MaxSize: 50
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 1
- m_LineSpacing: 1.1
- m_Text: "\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n"
- LanguageIndex: 11582
---- !u!1 &5667558055489348717
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+--- !u!1 &4938497245553369736
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -967,59 +990,58 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6483924622460555338}
- - component: {fileID: 4020458066690713623}
- - component: {fileID: 8553138685536091405}
- m_Layer: 5
- m_Name: upStarSkillTextPre (2)
+ - component: {fileID: 4119498240399747933}
+ - component: {fileID: 6616351915616639123}
+ - component: {fileID: 5019803147867402998}
+ m_Layer: 0
+ m_Name: attri
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &6483924622460555338
+--- !u!224 &4119498240399747933
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5667558055489348717}
+ m_GameObject: {fileID: 4938497245553369736}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 200}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 3678117272082407570}
- m_Father: {fileID: 3760028542271038676}
- m_RootOrder: 3
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+ m_Children: []
+ m_Father: {fileID: 7091551423015276754}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 0.5}
---- !u!222 &4020458066690713623
+ m_SizeDelta: {x: 263.5, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6616351915616639123
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5667558055489348717}
+ m_GameObject: {fileID: 4938497245553369736}
m_CullTransparentMesh: 0
---- !u!114 &8553138685536091405
+--- !u!114 &5019803147867402998
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5667558055489348717}
+ m_GameObject: {fileID: 4938497245553369736}
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.7254902, g: 0.6745098, b: 0.5921569, a: 1}
- m_RaycastTarget: 0
+ m_Color: {r: 0.9411765, g: 0.8627451, b: 0.65882355, a: 1}
+ m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -1027,19 +1049,99 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 38
+ m_FontSize: 42
m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 1
- m_MaxSize: 50
- m_Alignment: 3
+ m_BestFit: 1
+ m_MinSize: 20
+ m_MaxSize: 42
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
- m_VerticalOverflow: 1
- m_LineSpacing: 1.1
- m_Text: "\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n"
- LanguageIndex: 11582
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9B42\u5B9D\u5F3A\u5316\uFF1A"
+ LanguageIndex: 11583
+--- !u!1 &5626532314532234713
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6973272449204648427}
+ - component: {fileID: 6703049979085541253}
+ - component: {fileID: 4886708464318491077}
+ m_Layer: 0
+ m_Name: attri
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6973272449204648427
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5626532314532234713}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+ m_Children: []
+ m_Father: {fileID: 6221757196095462700}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 263.5, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6703049979085541253
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5626532314532234713}
+ m_CullTransparentMesh: 0
+--- !u!114 &4886708464318491077
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5626532314532234713}
+ 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.9411765, g: 0.8627451, b: 0.65882355, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 42
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 20
+ m_MaxSize: 42
+ m_Alignment: 5
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u7075\u5B9D\u5F3A\u5316\uFF1A"
+ LanguageIndex: 11583
--- !u!1 &6184524801851503571
GameObject:
m_ObjectHideFlags: 0
@@ -1157,7 +1259,7 @@ RectTransform:
m_Children:
- {fileID: 6253864916838499201}
m_Father: {fileID: 1199933653745891110}
- m_RootOrder: 1
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1281,7 +1383,7 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5171\u9E23\u6548\u679C"
LanguageIndex: 11580
---- !u!1 &6188904954183501606
+--- !u!1 &6616719307372965508
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1289,51 +1391,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1236357966149142646}
- - component: {fileID: 7870157441555631786}
- - component: {fileID: 7474753601526230771}
- m_Layer: 5
- m_Name: upStarSkillTextPre
+ - component: {fileID: 4486534862433315041}
+ - component: {fileID: 780720077988280342}
+ - component: {fileID: 7033260524260994204}
+ m_Layer: 0
+ m_Name: content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1236357966149142646
+--- !u!224 &4486534862433315041
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6188904954183501606}
+ m_GameObject: {fileID: 6616719307372965508}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 200}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 5691846046850870240}
- m_Father: {fileID: 3760028542271038676}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+ m_Children: []
+ m_Father: {fileID: 8408416685914430228}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 0.5}
---- !u!222 &7870157441555631786
+ m_SizeDelta: {x: 399.7, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &780720077988280342
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6188904954183501606}
+ m_GameObject: {fileID: 6616719307372965508}
m_CullTransparentMesh: 0
---- !u!114 &7474753601526230771
+--- !u!114 &7033260524260994204
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6188904954183501606}
+ m_GameObject: {fileID: 6616719307372965508}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -1360,9 +1461,9 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.1
- m_Text: "\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n"
+ m_Text: "\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566"
LanguageIndex: 11582
---- !u!1 &6759209820267051850
+--- !u!1 &7506210192396253903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1370,58 +1471,58 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8577048602149533822}
- - component: {fileID: 131183102777210381}
- - component: {fileID: 593639114645798672}
- m_Layer: 5
- m_Name: Text
+ - component: {fileID: 964532597798700942}
+ - component: {fileID: 2438901443161216646}
+ - component: {fileID: 5269203918029469777}
+ m_Layer: 0
+ m_Name: content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &8577048602149533822
+--- !u!224 &964532597798700942
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6759209820267051850}
- 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_GameObject: {fileID: 7506210192396253903}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
m_Children: []
- m_Father: {fileID: 8056039579428868941}
- m_RootOrder: 0
+ m_Father: {fileID: 3309088958550349775}
+ m_RootOrder: 1
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: 92, y: 0}
- m_SizeDelta: {x: 160, y: 30}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 399.7, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &131183102777210381
+--- !u!222 &2438901443161216646
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6759209820267051850}
+ m_GameObject: {fileID: 7506210192396253903}
m_CullTransparentMesh: 0
---- !u!114 &593639114645798672
+--- !u!114 &5269203918029469777
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6759209820267051850}
+ m_GameObject: {fileID: 7506210192396253903}
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.9411765, g: 0.8627451, b: 0.65882355, a: 1}
- m_RaycastTarget: 1
+ m_Color: {r: 0.7254902, g: 0.6745098, b: 0.5921569, a: 1}
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -1429,20 +1530,20 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 42
+ m_FontSize: 38
m_FontStyle: 0
- m_BestFit: 1
- m_MinSize: 20
- m_MaxSize: 42
- m_Alignment: 4
+ m_BestFit: 0
+ m_MinSize: 1
+ m_MaxSize: 50
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u6CD5\u5B9D\u7B49\u7EA7\uFF1A"
- LanguageIndex: 11583
---- !u!1 &7679944072317697601
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1.1
+ m_Text: "\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566"
+ LanguageIndex: 11582
+--- !u!1 &8284812888458930778
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1450,153 +1551,29 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 3217427705450324081}
- - component: {fileID: 6783943964110695012}
- - component: {fileID: 3786493237979312897}
+ - component: {fileID: 2283184035429657650}
+ - component: {fileID: 3669367387136500943}
+ - component: {fileID: 7501268194218290080}
m_Layer: 5
- m_Name: Text
+ m_Name: upStarSkillTextPre2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &3217427705450324081
+--- !u!224 &2283184035429657650
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7679944072317697601}
- 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: 3678117272082407570}
- m_RootOrder: 0
- 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: 92, y: 0}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6783943964110695012
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7679944072317697601}
- m_CullTransparentMesh: 0
---- !u!114 &3786493237979312897
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7679944072317697601}
- 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.9411765, g: 0.8627451, b: 0.65882355, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 42
- m_FontStyle: 0
- m_BestFit: 1
- m_MinSize: 20
- m_MaxSize: 42
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u9B42\u5B9D\u5F3A\u5316\uFF1A"
- LanguageIndex: 11583
---- !u!1 &7886103804383519879
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8056039579428868941}
- - component: {fileID: 8197022425307834388}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8056039579428868941
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7886103804383519879}
- 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:
- - {fileID: 8577048602149533822}
- m_Father: {fileID: 6418497370683569385}
- 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: 46.6, y: -16.7}
- m_SizeDelta: {x: 66.8, y: 33.4}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8197022425307834388
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7886103804383519879}
- m_CullTransparentMesh: 0
---- !u!1 &9048499989395737094
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4164959545876439772}
- - component: {fileID: 3745560784982217971}
- - component: {fileID: 4010702374552249380}
- m_Layer: 5
- m_Name: upStarSkillTextPre (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4164959545876439772
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9048499989395737094}
+ m_GameObject: {fileID: 8284812888458930778}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 200}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 6787766119249298228}
+ - {fileID: 9069950853308930063}
+ - {fileID: 2087683102881489736}
m_Father: {fileID: 3760028542271038676}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1605,21 +1582,89 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
---- !u!222 &3745560784982217971
+--- !u!222 &3669367387136500943
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9048499989395737094}
+ m_GameObject: {fileID: 8284812888458930778}
m_CullTransparentMesh: 0
---- !u!114 &4010702374552249380
+--- !u!114 &7501268194218290080
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9048499989395737094}
+ m_GameObject: {fileID: 8284812888458930778}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+--- !u!1 &8453682197541524323
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 504521069445950745}
+ - component: {fileID: 3402245396069457959}
+ - component: {fileID: 7759833500353388926}
+ m_Layer: 0
+ m_Name: content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &504521069445950745
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8453682197541524323}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+ m_Children: []
+ m_Father: {fileID: 6221757196095462700}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 399.7, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3402245396069457959
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8453682197541524323}
+ m_CullTransparentMesh: 0
+--- !u!114 &7759833500353388926
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8453682197541524323}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
@@ -1646,5 +1691,5 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.1
- m_Text: "\\t\\t\\t\\t\\t\\tD48A07>\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\n"
+ m_Text: "\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566"
LanguageIndex: 11582
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index e9f9d75aea..57b4f89dab 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -2194,10 +2194,10 @@
[12193] = GetLanguageStrById("获得鸿蒙碑共鸣效果"),
[12194] = GetLanguageStrById("获得鸿蒙阵共鸣效果"),
[12195] = GetLanguageStrById("%s%d星"),
- [12196] = GetLanguageStrById("\t\t\t\t\t\t%d级(当前上限%d级)"),
- [12197] = GetLanguageStrById("\t\t\t\t\t\t%d级(%s)"),
- [12198] = GetLanguageStrById("\t\t\t\t\t\t无"),
- [12199] = GetLanguageStrById("\t\t\t\t\t\t%s%d星(%s)"),
+ [12196] = GetLanguageStrById("%d级(当前上限%d级)"),
+ [12197] = GetLanguageStrById("%d级(%s)"),
+ [12198] = GetLanguageStrById("无"),
+ [12199] = GetLanguageStrById("%s%d星(%s)"),
[12200] = GetLanguageStrById("鸿蒙使者不足6位,无法产生共鸣!"),
[12201] = GetLanguageStrById("鸿蒙碑等级已达上限!"),
[12202] = GetLanguageStrById("鸿蒙塔等级:"),
@@ -2232,4 +2232,5 @@
[12231] = GetLanguageStrById("$99.99抢购"),
[12232] = GetLanguageStrById("每周限购 %s 个"),
[12233] = GetLanguageStrById("核心神将:"),
+ [12234] = GetLanguageStrById("%d次内必得金色及以上魂印"),
}
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
index 73f181aae0..a12b95c211 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
@@ -13,11 +13,11 @@ local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
function GongMingResultTips:InitComponent()
self.BackMask = Util.GetGameObject(self.transform, "BackMask")
self.breakOpenSkillGrid =Util.GetGameObject(self.transform, "bg/breakOpenSkill/Mask")
- self.upStarSkillTextPreDegree = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre")
- self.upStarSkillTextPreEquip = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre (1)")
- self.upStarSkillTextPreHun = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre (2)")
- self.upStarSkillTextPreSoul = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre (3)")
- self.upStarSkillTextPreFa = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre (4)")
+ self.upStarSkillTextPreDegree = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre1/content")
+ self.upStarSkillTextPreEquip = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre2/content")
+ self.upStarSkillTextPreHun = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre3/content")
+ self.upStarSkillTextPreSoul = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre4/content")
+ self.upStarSkillTextPreFa = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre5/content")
self.upStarOpenSkill =Util.GetGameObject(self.transform, "bg/upStarOpenSkill/Mask")
end
@@ -51,19 +51,19 @@ function GongMingResultTips:OnOpen(skinId)
self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12196],data[i].value,num)
elseif data[i].heroTid == -1 then
else
- self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12197],data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12197],data[i].value,GetLanguageStrById(ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
end
elseif data[i].additionType == 2 then
if data[i].value == -1 then
self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format(Language[12198])
else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value)
- self.upStarSkillTextPreEquip:GetComponent("Text").text = GetStringByEquipQua(equip.Quality,string.format(Language[12199],GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
+ self.upStarSkillTextPreEquip:GetComponent("Text").text = GetStringByEquipQua(equip.Quality,string.format(Language[12199],GetQuantityStrByquality(equip.Quality),equip.Stars,GetLanguageStrById(ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)))
end
elseif data[i].additionType == 3 then
if data[i].heroTid~= 0 and data[i].value > 0 then
self.upStarSkillTextPreHun:SetActive(true)
- self.upStarSkillTextPreHun:GetComponent("Text").text = string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ self.upStarSkillTextPreHun:GetComponent("Text").text = string.format("%d(%s)",data[i].value,GetLanguageStrById(ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
else
if PlayerManager.level<75 then
self.upStarSkillTextPreHun:SetActive(false)
@@ -76,7 +76,7 @@ function GongMingResultTips:OnOpen(skinId)
elseif data[i].additionType == 4 then
if data[i].heroTid ~= 0 and data[i].value > 0 then
self.upStarSkillTextPreSoul:SetActive(true)
- self.upStarSkillTextPreSoul:GetComponent("Text").text =string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ self.upStarSkillTextPreSoul:GetComponent("Text").text =string.format("%d(%s)",data[i].value,GetLanguageStrById(ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
else
if PlayerManager.level<75 then
self.upStarSkillTextPreSoul:SetActive(false)
@@ -89,7 +89,7 @@ function GongMingResultTips:OnOpen(skinId)
else
if data[i].value ~= -1 then
print(data[i].heroTid )
- self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("%d(%s)",data[i].value,GetLanguageStrById(ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
else
self.upStarSkillTextPreFa:GetComponent("Text").text =string.format(Language[12198])
end
diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv
index f86369cb66..165cdfb30d 100644
--- a/data_execl/Language_data/LanguageLua.csv
+++ b/data_execl/Language_data/LanguageLua.csv
@@ -2193,10 +2193,10 @@
12193,úɱЧ
12194,úЧ
12195,%s%d
-12196,\t\t\t\t\t\t%d(ǰ%d)
-12197,\t\t\t\t\t\t%d(%s)
-12198,\t\t\t\t\t\t
-12199,\t\t\t\t\t\t%s%d(%s)
+12196,%d(ǰ%d)
+12197,%d(%s)
+12198,
+12199,%s%d(%s)
12200,ʹ߲6λ
12201,ɱȼѴޣ
12202,ȼ
@@ -2231,3 +2231,4 @@
12231,$99.99
12232,ÿ %s
12233,
+12234,%dڱصýɫϻӡ