diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab
index 7e0192c99f..d65c1932fe 100644
--- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab
@@ -183,7 +183,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1321527179551917336}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -265,6 +265,7 @@ RectTransform:
m_Children:
- {fileID: 1136268255389708895}
- {fileID: 7863316847141296098}
+ - {fileID: 6175779299585162603}
- {fileID: 6463751900913405108}
- {fileID: 8774981285679062559}
- {fileID: 2635857727710591680}
@@ -864,7 +865,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &2757897696790518301
RectTransform:
m_ObjectHideFlags: 0
@@ -951,8 +952,9 @@ RectTransform:
m_Children:
- {fileID: 2757897696151363764}
- {fileID: 2757897696790518301}
+ - {fileID: 8837216866772288400}
m_Father: {fileID: 1321527179551917336}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -989,7 +991,7 @@ RectTransform:
m_Children:
- {fileID: 5634055806577482042}
m_Father: {fileID: 1321527179551917336}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1388,7 +1390,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1321527179551917336}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1438,6 +1440,102 @@ MonoBehaviour:
m_LineSpacing: 1.1
m_Text:
LanguageIndex: 0
+--- !u!1 &5808990718563095471
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8837216866772288400}
+ - component: {fileID: 1071852450726802879}
+ - component: {fileID: 6558049417613330112}
+ - component: {fileID: 8467616764187085207}
+ m_Layer: 0
+ m_Name: Text (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8837216866772288400
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5808990718563095471}
+ 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: 8774981285679062559}
+ m_RootOrder: 2
+ 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: 2.2999878, y: -92}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1071852450726802879
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5808990718563095471}
+ m_CullTransparentMesh: 0
+--- !u!114 &6558049417613330112
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5808990718563095471}
+ 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.28627452, g: 0.21568629, b: 0.019607844, 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: 100
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 100
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u8EAB\u5916\u5316\u8EAB"
+ LanguageIndex: 0
+--- !u!114 &8467616764187085207
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5808990718563095471}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 1, g: 1, b: 1, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &5818864900584350080
GameObject:
m_ObjectHideFlags: 0
@@ -2553,6 +2651,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &8743365401852574809
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6175779299585162603}
+ - component: {fileID: 3316196383700705447}
+ - component: {fileID: 907828788664263972}
+ m_Layer: 5
+ m_Name: TipBg
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6175779299585162603
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8743365401852574809}
+ 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: 1321527179551917336}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 287}
+ m_SizeDelta: {x: 580, y: 56}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3316196383700705447
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8743365401852574809}
+ m_CullTransparentMesh: 0
+--- !u!114 &907828788664263972
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8743365401852574809}
+ 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: e5d62ef53f4e50b4c82c34fb24fff4bd, 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!1 &9127811344504143378
GameObject:
m_ObjectHideFlags: 0
@@ -2588,7 +2760,7 @@ RectTransform:
- {fileID: 9001216159104841426}
- {fileID: 9187613851081370445}
m_Father: {fileID: 1321527179551917336}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab
index edb616e6f9..22720fe01f 100644
--- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab
@@ -106,7 +106,7 @@ RectTransform:
m_Children:
- {fileID: 8785790970003162804}
m_Father: {fileID: 1116588779719440858}
- m_RootOrder: 2
+ 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}
@@ -181,7 +181,7 @@ RectTransform:
m_Children:
- {fileID: 4241989016896541161}
m_Father: {fileID: 6304393456673193057}
- m_RootOrder: 2
+ 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}
@@ -483,13 +483,13 @@ RectTransform:
m_Children:
- {fileID: 2972368746428327172}
- {fileID: 3323996371478260742}
- m_Father: {fileID: 6304393456673193057}
+ m_Father: {fileID: 5324685262515429065}
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: 234.5, y: 8.9999695}
- m_SizeDelta: {x: 319.5, y: 426}
+ 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.5, y: 0.5}
--- !u!222 &6528201035649526813
CanvasRenderer:
@@ -768,8 +768,8 @@ RectTransform:
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, y: -84}
- m_SizeDelta: {x: 203.63, y: 420.93}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 203.63, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8801368178299636609
CanvasRenderer:
@@ -921,8 +921,8 @@ RectTransform:
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: 78, y: -84}
- m_SizeDelta: {x: 203.63, y: 420.93}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 203.63, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3702563469552144756
CanvasRenderer:
@@ -984,9 +984,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 433140002495899418}
- - {fileID: 1485777765112209464}
- {fileID: 1956463804}
+ - {fileID: 5324685262515429065}
m_Father: {fileID: 3747604606915676520}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1192,13 +1191,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 727245152979932345}
- m_Father: {fileID: 1116588779719440858}
+ m_Father: {fileID: 4228168305782732596}
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: -90.899994, y: -55.3}
- 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: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2938799554682200889
CanvasRenderer:
@@ -1673,13 +1672,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6340472506926287126}
- m_Father: {fileID: 6304393456673193057}
+ m_Father: {fileID: 5324685262515429065}
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: -247.5, y: 9}
- m_SizeDelta: {x: 319.5, y: 426}
+ 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.5, y: 0.5}
--- !u!222 &3714585843943916770
CanvasRenderer:
@@ -1723,7 +1722,7 @@ RectTransform:
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: -240.70007, y: -41}
+ m_AnchoredPosition: {x: -219, y: -41}
m_SizeDelta: {x: 122, y: 110.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4580303290385541971
@@ -1791,9 +1790,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 4153369381942310120}
- - {fileID: 4169055837738955625}
- {fileID: 813371932}
+ - {fileID: 4228168305782732596}
m_Father: {fileID: 3747604606915676520}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1923,7 +1921,7 @@ RectTransform:
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: -182.2, y: 0}
+ m_AnchoredPosition: {x: -223, y: 0}
m_SizeDelta: {x: 122, y: 110.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8117318197206743228
@@ -2041,7 +2039,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u751F\u547D"
+ m_Text: "\u751F\u547D\uFF1A5000"
LanguageIndex: 11153
--- !u!1 &3441162324259417062
GameObject:
@@ -2209,8 +2207,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 309928333}
- - {fileID: 7516098785036665236}
- - {fileID: 6372759513489355949}
+ - {fileID: 13993384408737725}
m_Father: {fileID: 3747604606915676520}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2305,7 +2302,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u751F\u547D"
+ m_Text: "\u751F\u547D\uFF1A5000"
LanguageIndex: 11153
--- !u!1 &4161217518857284297
GameObject:
@@ -2421,7 +2418,7 @@ RectTransform:
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: -248.20007, y: -29}
+ m_AnchoredPosition: {x: -186.8, y: 36.9}
m_SizeDelta: {x: 122, y: 110.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &205974353515231369
@@ -3307,13 +3304,13 @@ RectTransform:
m_Children:
- {fileID: 9194224169495072879}
- {fileID: 5807097309329945100}
- m_Father: {fileID: 6431628141810528646}
- m_RootOrder: 2
+ m_Father: {fileID: 13993384408737725}
+ 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: 227, y: -46.899994}
- m_SizeDelta: {x: 342.4, y: 261.5}
+ 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.5, y: 0.5}
--- !u!222 &2901527531666448690
CanvasRenderer:
@@ -3352,6 +3349,148 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &5817012391880216908
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5324685262515429065}
+ - component: {fileID: 7901885575843349848}
+ - component: {fileID: 5963059995209370879}
+ m_Layer: 5
+ m_Name: grid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5324685262515429065
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5817012391880216908}
+ 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: 433140002495899418}
+ - {fileID: 1485777765112209464}
+ m_Father: {fileID: 6304393456673193057}
+ 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: -19, y: -27.1}
+ m_SizeDelta: {x: 800, y: 285.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7901885575843349848
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5817012391880216908}
+ m_CullTransparentMesh: 0
+--- !u!114 &5963059995209370879
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5817012391880216908}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 38
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 203.63, y: 280}
+ m_Spacing: {x: 176, y: 0}
+ m_Constraint: 1
+ m_ConstraintCount: 2
+--- !u!1 &5982594567533656065
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 13993384408737725}
+ - component: {fileID: 5914895249129423319}
+ - component: {fileID: 939618212230558042}
+ m_Layer: 5
+ m_Name: grid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &13993384408737725
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5982594567533656065}
+ 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: 7516098785036665236}
+ - {fileID: 6372759513489355949}
+ m_Father: {fileID: 6431628141810528646}
+ 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: -21, y: -47}
+ m_SizeDelta: {x: 800, y: 285.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5914895249129423319
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5982594567533656065}
+ m_CullTransparentMesh: 0
+--- !u!114 &939618212230558042
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5982594567533656065}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 38
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 342.4, y: 261.5}
+ m_Spacing: {x: 100, y: 0}
+ m_Constraint: 1
+ m_ConstraintCount: 2
--- !u!1 &6178998977080599659
GameObject:
m_ObjectHideFlags: 0
@@ -3509,7 +3648,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u751F\u547D"
+ m_Text: "\u751F\u547D\uFF1A5000"
LanguageIndex: 11153
--- !u!1 &6591624520537772728
GameObject:
@@ -3615,13 +3754,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 900007890020869302}
- m_Father: {fileID: 6431628141810528646}
- m_RootOrder: 1
+ m_Father: {fileID: 13993384408737725}
+ 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: -232, y: -46.899994}
- m_SizeDelta: {x: 342.4, y: 261.5}
+ 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.5, y: 0.5}
--- !u!222 &6710048945208797652
CanvasRenderer:
@@ -3695,6 +3834,77 @@ RectTransform:
m_AnchoredPosition: {x: 0.000022888184, y: 3.9099865}
m_SizeDelta: {x: 142.16, y: 29.09}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &7285940427392946135
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4228168305782732596}
+ - component: {fileID: 2287879122117041512}
+ - component: {fileID: 5469901599491422168}
+ m_Layer: 5
+ m_Name: grid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4228168305782732596
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7285940427392946135}
+ 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: 4153369381942310120}
+ - {fileID: 4169055837738955625}
+ m_Father: {fileID: 1116588779719440858}
+ 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: 36, y: -50}
+ m_SizeDelta: {x: 800, y: 103.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2287879122117041512
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7285940427392946135}
+ m_CullTransparentMesh: 0
+--- !u!114 &5469901599491422168
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7285940427392946135}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 160, y: 30}
+ m_Spacing: {x: 220, y: 0}
+ m_Constraint: 0
+ m_ConstraintCount: 2
--- !u!1 &7300509270423643624
GameObject:
m_ObjectHideFlags: 0
@@ -4053,13 +4263,13 @@ RectTransform:
m_Children:
- {fileID: 697987277784672858}
- {fileID: 7186049896457083654}
- m_Father: {fileID: 1116588779719440858}
+ m_Father: {fileID: 4228168305782732596}
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: 168.5, y: -55.299988}
- 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: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1303151076390320358
CanvasRenderer:
@@ -4182,7 +4392,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u751F\u547D"
+ m_Text: "\u751F\u547D\uFF1A5000"
LanguageIndex: 11153
--- !u!1 &8321031524271809454
GameObject:
diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua
index 2b34bb2cbe..52c05b1867 100644
--- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua
@@ -91,30 +91,6 @@ function IncarnationPanel:BindEvent()
end)
Util.AddClick(self.incarnationPowerBtn, function()
- -- local data = {}
- -- local singData = {}
- -- singData.title = "当前化身收集度"
- -- singData.pro = {}
- -- singData.tip = string.format("%s/%s",IncarnationManager.GetActiveNum(),LengthOfTable(IncarnationManager.itemDataList))
- -- table.insert(data,singData)
- -- local singData = {}
- -- singData.title = "化身之力加成"
- -- singData.pro = IncarnationManager.GetproDesLst(IncarnationManager.GetIncarnationPower(),"00FF00")
- -- singData.tip = ""
- -- table.insert(data,singData)
- -- local singData = {}
- -- singData.title = ""
- -- singData.pro = {}
- -- singData.tip = string.format("说明:每获得一种化身,全体神将获得如下属性加成:\n%s",IncarnationManager.SingleIncarnationProDes)
- -- table.insert(data,singData)
- -- -- for i = 1 ,#data do
- -- -- LogGreen("data[i]:"..data[i].title.." #pro:"..#data[i].pro)
- -- -- for k,v in ipairs(data[i].pro) do
- -- -- LogGreen("data[i]:"..v)
- -- -- end
- -- -- end
- -- UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.IncarnationDes,data)
-
UIManager.OpenPanel(UIName.IncarnationForcePanel)
end)
@@ -125,12 +101,6 @@ function IncarnationPanel:BindEvent()
singData.pro = IncarnationManager.GetproDesLst(IncarnationManager.GetIncarnationTotalPro(),"00FF00")
singData.tip = "总加成包括化身之力提供的属性"
table.insert(data,singData)
- -- for i = 1 ,#data do
- -- LogGreen("data[i]:"..data[i].title.." #pro:"..#data[i].pro)
- -- for k,v in ipairs(data[i].pro) do
- -- LogGreen("data[i]:"..v)
- -- end
- -- end
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.IncarnationDes,data)
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua
index eb7811ee90..93642c0e56 100644
--- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua
@@ -18,16 +18,16 @@ function this:InitComponent()
this.itemView= SubUIManager.Open(SubUIConfig.ItemView, this.prefab.transform)
this.lvLayout=Util.GetGameObject(self.gameObject, "root/verLayout/lvLayout")
- this.curLvText=Util.GetGameObject(this.lvLayout, "curLv"):GetComponent("Text")
- this.nextLvText=Util.GetGameObject(this.lvLayout, "nextLv"):GetComponent("Text")
+ this.curLvText=Util.GetGameObject(this.lvLayout, "grid/curLv"):GetComponent("Text")
+ this.nextLvText=Util.GetGameObject(this.lvLayout, "grid/nextLv"):GetComponent("Text")
this.proyLayout=Util.GetGameObject(self.gameObject, "root/verLayout/proyLayout")
- this.curProp=Util.GetGameObject(this.proyLayout, "curProp")
- this.nextProp=Util.GetGameObject(this.proyLayout, "nextProp")
+ this.curProp=Util.GetGameObject(this.proyLayout, "grid/curProp")
+ this.nextProp=Util.GetGameObject(this.proyLayout, "grid/nextProp")
this.skillLayout=Util.GetGameObject(self.gameObject, "root/verLayout/skillLayout")
- this.curSkillDes=Util.GetGameObject(this.skillLayout, "curSkillDes/text"):GetComponent("Text")
- this.nextSkillDes=Util.GetGameObject(this.skillLayout, "nextSkillDes/text"):GetComponent("Text")
+ this.curSkillDes=Util.GetGameObject(this.skillLayout, "grid/curSkillDes/text"):GetComponent("Text")
+ this.nextSkillDes=Util.GetGameObject(this.skillLayout, "grid/nextSkillDes/text"):GetComponent("Text")
--消耗相关
this.costLayout=Util.GetGameObject(self.gameObject, "root/verLayout/costLayout")
@@ -120,7 +120,7 @@ function this.UpdateWin()
this.upLvBtn.gameObject:SetActive(true)
this.upStarBtn.gameObject:SetActive(false)
this.skillLayout.gameObject:SetActive(false)
- this.SetPropInfo(this.curProp,curLevel,propData)
+ this.SetPropInfo(this.curProp,propData)
if this.CheckLevelLimit() then
this.nextProp.gameObject:SetActive(false)
this.costGrid.gameObject:SetActive(false)
@@ -128,7 +128,7 @@ function this.UpdateWin()
this.nextProp.gameObject:SetActive(true)
this.costGrid.gameObject:SetActive(true)
local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,true,false)
- this.SetPropInfo(this.nextProp,curLevel+1,nextPropData)
+ this.SetPropInfo(this.nextProp,nextPropData)
local cardLvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"Level",curLevel,"PoolId",this.cardConfig.LevelUpPool)
this.SetCostItem(cardLvConfig.Exp)
end
@@ -145,25 +145,26 @@ function this.UpdateWin()
this.skillLayout.gameObject:SetActive(true)
this.curSkillDes.gameObject:SetActive(true)
this.curSkillDes.text=IncarnationManager.GetSkillDesStr(curCardId,curStar)
- this.SetPropInfo(this.curProp,curStar,propData)
+ this.SetPropInfo(this.curProp,propData)
if this.CheckStarLimit() then
+ this.nextLvText.gameObject:SetActive(false)
this.nextProp.gameObject:SetActive(false)
this.costGrid.gameObject:SetActive(false)
- this.nextSkillDes.gameObject:SetActive(false)
+ this.nextSkillDes.transform.parent.gameObject:SetActive(false)
else
this.nextSkillDes.gameObject:SetActive(true)
this.nextSkillDes.text=IncarnationManager.GetSkillDesStr(curCardId,curStar+1)
this.nextProp.gameObject:SetActive(true)
this.costGrid.gameObject:SetActive(true)
local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,false,true)
- this.SetPropInfo(this.nextProp,curStar+1,nextPropData)
+ this.SetPropInfo(this.nextProp,nextPropData)
this.SetCostItem(this.cardConfig.StarUpCost[curStar+1])
end
end
end
-function this.SetPropInfo(propObj,lv,propData)
+function this.SetPropInfo(propObj,propData)
local propGrid=Util.GetGameObject(propObj, "propGrid")
local index=0