diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab index 0c20f8372b..476e41b7d3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab @@ -4866,7 +4866,7 @@ ParticleSystem: --- !u!199 &3722364760228860835 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -5160,6 +5160,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} m_Children: + - {fileID: 1501543184094655005} - {fileID: 5126240348959744742} - {fileID: 2223673998178310623} m_Father: {fileID: 9193158905020371500} @@ -9884,7 +9885,7 @@ ParticleSystem: --- !u!199 &8673376439305543100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10179,7 +10180,7 @@ GameObject: - component: {fileID: 7433579166189575151} - component: {fileID: 529016148329649704} m_Layer: 5 - m_Name: 4 + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10192,21 +10193,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1002033211867548621} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.0666667, y: 1.0666667, z: 1.0666667} m_Children: - {fileID: 7045819589683826320} - {fileID: 3037697255413289303} - {fileID: 7245899375252331295} - {fileID: 8002111338041003019} - {fileID: 2780966490378360097} - m_Father: {fileID: 4008423986481829657} - m_RootOrder: 15 + m_Father: {fileID: 6999259997014095155} + 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: 0, y: -667} + m_AnchoredPosition: {x: -6.4000006, y: 0.24029541} m_SizeDelta: {x: 1023, y: 378} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9215002787405014052 @@ -10373,10 +10374,6 @@ RectTransform: - {fileID: 5722163531026190317} - {fileID: 5385665210204337624} - {fileID: 5333837363576207506} - - {fileID: 4857275258040740634} - - {fileID: 1501543184094655005} - - {fileID: 6640141017229333781} - - {fileID: 618562471175131821} - {fileID: 6532840170437637994} - {fileID: 547635923962971225} - {fileID: 9071599073778564586} @@ -15105,7 +15102,7 @@ ParticleSystem: --- !u!199 &6626377497596951078 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15194,10 +15191,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} m_Children: + - {fileID: 6640141017229333781} - {fileID: 5474543492551904690} - {fileID: 2072261152491225443} m_Father: {fileID: 9193158905020371500} - m_RootOrder: 3 + 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} @@ -15304,10 +15302,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} m_Children: + - {fileID: 618562471175131821} - {fileID: 4661927301547137497} - {fileID: 2824687265894592408} m_Father: {fileID: 9193158905020371500} - m_RootOrder: 0 + 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} @@ -15636,7 +15635,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4008423986481829657} - m_RootOrder: 16 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20451,7 +20450,7 @@ ParticleSystem: --- !u!199 &8864625833816533577 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20523,7 +20522,7 @@ GameObject: - component: {fileID: 6299462950997117928} - component: {fileID: 9016468196066224390} m_Layer: 5 - m_Name: 3 + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -20536,21 +20535,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2769066494937242744} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.0666667, y: 1.0666667, z: 1.0666667} m_Children: - {fileID: 305468047086788170} - {fileID: 3882550482259944220} - {fileID: 782078140639551013} - {fileID: 7499656815917462540} - {fileID: 679024840740501202} - m_Father: {fileID: 4008423986481829657} - m_RootOrder: 14 + m_Father: {fileID: 4259172502780319810} + 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: 0, y: -274.6} + m_AnchoredPosition: {x: -2.319987, y: -1.7598877} m_SizeDelta: {x: 1023, y: 359} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3875556759133895883 @@ -20729,7 +20728,7 @@ RectTransform: m_Children: - {fileID: 5754961852747209820} m_Father: {fileID: 8329884962036650588} - m_RootOrder: 0 + 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} @@ -25479,7 +25478,7 @@ ParticleSystem: --- !u!199 &3948419917188806566 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25642,7 +25641,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 2} m_Children: [] m_Father: {fileID: 6999259997014095155} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -25869,7 +25868,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 2} m_Children: [] m_Father: {fileID: 4732995743265632694} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -26240,7 +26239,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 2} m_Children: [] m_Father: {fileID: 4259172502780319810} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -31338,7 +31337,7 @@ ParticleSystem: --- !u!199 &4085447202063624412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36036,7 +36035,7 @@ ParticleSystem: --- !u!199 &4618370545438336606 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36273,7 +36272,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4732995743265632694} - m_RootOrder: 1 + 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} @@ -36350,7 +36349,7 @@ RectTransform: - {fileID: 4528864398346648600} - {fileID: 7723005706332657342} m_Father: {fileID: 9193158905020371500} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -36466,7 +36465,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6999259997014095155} - m_RootOrder: 1 + 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} @@ -36540,9 +36539,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.3333334, y: 1.3333334, z: 1.3333334} m_Children: + - {fileID: 4857275258040740634} - {fileID: 7677851812191043880} m_Father: {fileID: 9193158905020371500} - m_RootOrder: 4 + 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} @@ -41420,7 +41420,7 @@ ParticleSystem: --- !u!199 &2209005804314532050 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41509,7 +41509,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4008423986481829657} - m_RootOrder: 17 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -41585,7 +41585,7 @@ RectTransform: - {fileID: 2460302711176324883} - {fileID: 6530820398036061962} m_Father: {fileID: 4008423986481829657} - m_RootOrder: 18 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -46294,7 +46294,7 @@ ParticleSystem: --- !u!199 &3423359422657097217 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46940,7 +46940,7 @@ GameObject: - component: {fileID: 1069789187062362692} - component: {fileID: 611620659020065170} m_Layer: 5 - m_Name: 2 + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -46953,21 +46953,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6200162455758181569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.0666667, y: 1.0666667, z: 1.0666667} m_Children: - {fileID: 5938809292425355952} - {fileID: 2818611873041803185} - {fileID: 7876301376202701536} - {fileID: 2023611670711480314} - {fileID: 5863291020390352401} - m_Father: {fileID: 4008423986481829657} - m_RootOrder: 13 + m_Father: {fileID: 4732995743265632694} + 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: 0, y: 89} + m_AnchoredPosition: {x: -3.9199872, y: -5.5998764} m_SizeDelta: {x: 1023, y: 362} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &860064929762379231 @@ -47216,7 +47216,7 @@ GameObject: - component: {fileID: 2198781733884664743} - component: {fileID: 3502884012609026530} m_Layer: 5 - m_Name: 1 + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -47229,7 +47229,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6531145027874733707} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -47238,12 +47238,12 @@ RectTransform: - {fileID: 3043011253485797517} - {fileID: 7653409470114741054} - {fileID: 3198984158963334789} - m_Father: {fileID: 4008423986481829657} - m_RootOrder: 12 + m_Father: {fileID: 8329884962036650588} + 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: 0, y: 457} + m_AnchoredPosition: {x: 0, y: 5.750122} m_SizeDelta: {x: 1023, y: 356} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8890730762987158791 @@ -47492,7 +47492,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4259172502780319810} - m_RootOrder: 1 + 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} @@ -52507,7 +52507,7 @@ ParticleSystem: --- !u!199 &8446088243069999489 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52641,7 +52641,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8219633146266175604 CanvasRenderer: @@ -53028,11 +53028,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: - - {fileID: 6999259997014095155} - - {fileID: 4732995743265632694} - - {fileID: 3682491641363753976} - - {fileID: 4259172502780319810} - {fileID: 8329884962036650588} + - {fileID: 4732995743265632694} + - {fileID: 4259172502780319810} + - {fileID: 6999259997014095155} + - {fileID: 3682491641363753976} m_Father: {fileID: 1915107041368105942} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -58455,7 +58455,7 @@ ParticleSystem: --- !u!199 &2110266683627223354 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 8229565e29..7708694765 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -4554,7 +4554,7 @@ ParticleSystem: --- !u!199 &199787422305027156 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9203,7 +9203,7 @@ ParticleSystem: --- !u!199 &199651780022285358 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11585,7 +11585,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6181894268526856646 RectTransform: m_ObjectHideFlags: 0 @@ -16457,6 +16457,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5203907596944178455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8058424431263567449} + - component: {fileID: 6735249265126055928} + - component: {fileID: 6102012749895139598} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8058424431263567449 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5203907596944178455} + 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: 3460517663753271504} + 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} + m_AnchoredPosition: {x: 0, y: 137} + m_SizeDelta: {x: 600, y: 73.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6735249265126055928 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5203907596944178455} + m_CullTransparentMesh: 0 +--- !u!114 &6102012749895139598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5203907596944178455} + 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.93333334, g: 0.7137255, b: 0.3019608, 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: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 46 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u795E\u5C0630 \u7EA7\u53EF\u4E0A\u9635" + LanguageIndex: 10641 --- !u!1 &5247863111868039612 GameObject: m_ObjectHideFlags: 0 @@ -18841,6 +18921,7 @@ RectTransform: - {fileID: 2849262556332886968} - {fileID: 1902571392055290900} - {fileID: 2569408580599364419} + - {fileID: 8058424431263567449} m_Father: {fileID: 224946850722905528} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -21039,7 +21120,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2849262556332886968 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f89c541f34..f862b07b8a 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -914,6 +914,7 @@ FORMATION_TYPE = { SAVE_FORMATION=17, GUILD_CAR_DELEAY=18, GUILD_DEATHPOS=19, + XUANYUAN_MIRROR=20, } --活动Type定义 @@ -1158,10 +1159,11 @@ FUNCTION_OPEN_TYPE = { DAILYCHALLENGE_HERODEBRIS=69,--每日角色碎片副本 DAILYCHALLENGE_TALISMAN=70,--每日法宝副本 DAILYCHALLENGE_SOULPRINT=71,--每日魂印副本 - MAGIC_MIRROR=74,--妖灵宝镜 - PEOPLE_MIRROR=75,--人杰宝镜 - BUDDHIST_MIRROR=76,--佛禅宝镜 - TAOIST_MIRROR=77,--道玄宝镜 + XUANYUAN_MIRROR=74,--妖灵宝镜 + MAGIC_MIRROR=75,--妖灵宝镜 + PEOPLE_MIRROR=76,--人杰宝镜 + BUDDHIST_MIRROR=77,--佛禅宝镜 + TAOIST_MIRROR=78,--道玄宝镜 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index a60697b18b..73dff40556 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -319,6 +319,9 @@ UIName = { EquipSellSelectPopup = 318,--装备分解选择界面 QianKunBoxBuyOnePanel = 319,--乾坤宝囊购买1次 QianKunBoxBuyTenPanel = 320,--乾坤宝囊购买10次 + XuanYuanMirrorPanel = 321,--轩辕宝镜界面 + XuanYuanMirrorPanelList = 322,--轩辕宝镜单个宝镜界面 + CarbonTypePanelV3 = 323,--轩辕宝镜单个宝镜界面 } diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 3f75bb75a0..e01292e305 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -12,25 +12,6 @@ function CarbonTypePanelV2:InitComponent() --日常副本 this.dailyCarbonBtn=Util.GetGameObject(self.gameObject,"DailyCarbonBtn") - -- for i = 2, 4 do - -- Util.SetGray(Util.GetGameObject(self.gameObject,"BgRoot/"..i),true) - -- end - - -- this.newText = {} - - -- -- 四个新图标 - -- this.newText = { - -- [CARBON_TYPE.NORMAL] = Util.GetGameObject(this.btnNormal, "Image"), - -- [CARBON_TYPE.ENDLESS] = Util.GetGameObject(this.btnLegend, "Image"), - -- [CARBON_TYPE.TRIAL] = Util.GetGameObject(this.btnEpic, "Image"), - -- [CARBON_TYPE.HERO] = Util.GetGameObject(this.btnHero, "Image"), - -- } - - - --- 活动开启时间显示 - -- this.countTime = Util.GetGameObject(self.gameObject, "btnRoot/circle/Image/time"):GetComponent("Text") - -- this.timerRoot = Util.GetGameObject(self.gameObject, "btnRoot/circle/Image") - this.effect = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect") this.wind = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect/juneng_chenggong/GameObject") diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua index 7e19feabdc..f7ddea76a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -1,17 +1,92 @@ XuanYuanMirrorManager = {}; +local raceTowerConfig = ConfigManager.GetConfig(ConfigName.RaceTowerConfig) +local raceTowerRewardConfig = ConfigManager.GetConfig(ConfigName.RaceTowerRewardConfig) local this = XuanYuanMirrorManager local levelData = {} + function this.Initialize() end + +--前端表 function this.GetMirrorData(_type) - local dataList={} - local data={} - data.state = this.GetState(_type,1) - table.insert(data) -return dataList + if levelData[_type] then + return levelData[_type] + end + this.InitMirrorData(_type) end + +function this.InitMirrorData(_type) + levelData = {} + for k,v in pairs(raceTowerConfig) do + if not levelData[v.Type] then + levelData[v.Type] = {} + end + local data={} + data.id = v.Id + data.type = v.Type + data.openRules = v.OpenRules + data.difficulity = v.Quality + data.monsterId = v.MonsterId + LogGreen("v.TeamRules:"..#v.TeamRules) + data.teamRules = v.TeamRules + data.condition = string.format("需要上阵%s名%s系神将",data.teamRules[1][2],this.PropertyName(data.teamRules[1][1])) + --概率奖励 + local tempConfig = ConfigManager.GetConfigData(ConfigName.RewardGroup,v.Reward) + LogGreen("ShowItem:"..#tempConfig.ShowItem) + data.rewardList = {} + for i=1, #tempConfig.ShowItem do + table.insert(data.rewardList,{id = tempConfig.ShowItem[i][1],num = tempConfig.ShowItem[i][2],israte = true}) + end + --扫荡奖励 + LogGreen("RewardView:"..#v.RewardView) + for i=1, #v.RewardView do + table.insert(data.rewardList,{id = v.RewardView[i][1],num = v.RewardView[i][2]}) + end + --首通奖励 + LogGreen("FirstRewardView:"..#v.FirstRewardView) + for i=1, #v.FirstRewardView do + table.insert(data.rewardList,{id = v.FirstRewardView[i][1],num = v.FirstRewardView[i][2],isFirst = true}) + end + table.insert(levelData[v.Type],data) + end +end + +function this.UpdateState() + +end + +function this.PropertyName(_type) + _type = tonumber(_type) + if _type == 1 then + return "人" + elseif _type == 2 then + return "佛" + elseif _type == 3 then + return "妖" + elseif _type == 4 then + return "道" + else + return "人" + end +end + function this.GetState(_type,id) return -1 end + +function this.GetRewardView() + local dataList = {} + for k,v in pairs(raceTowerRewardConfig) do + local data = {} + if v.Section[1] == v.Section[2] then + data.rank = v.Section[1] + elseif v.Section[2] ~= -1 then + data.rank = v.Section[1] - v.Section[2] + else + + end + end +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index 6a50e8941f..586da21c04 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -109,32 +109,13 @@ function this:OnShow(...) -- 播放动画 this:PlayAni() - this.SetOpenText() this.PlayScaleAnim() end ---- 设置时候显示新字 -----@param btnCarbon 副本类型按钮 -function this.SetNewTextShow(btnCarbon, state) - --for i, v in pairs(this.newText) do - -- if i == carbonType then - -- v:SetActive(state) - -- end - --end - - if btnCarbon then - local textGo = Util.GetGameObject(btnCarbon.transform, "Image") - if textGo then - textGo:SetActive(state) - end - end -end - function this:OnSortingOrderChange() Util.AddParticleSortLayer(this.effect, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.wind, self.sortingOrder - orginLayer) - Util.AddParticleSortLayer(this.vipPrivilegeBtn, self.sortingOrder - orginLayer) orginLayer = self.sortingOrder end diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index f11b2200bf..40e7a322c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -14,7 +14,7 @@ local colorText = { text = { [-1] = "未开启",[0] = "挑战",[1] = "扫荡" } } local difficult = { - text = {"简单","普通","困难","噩梦"}, + text = {"简单","普通","困难","噩梦","炼狱","地狱","深渊","传奇","神话"}, sprite = {"x_xb_tiao_05","x_xb_tiao_04","x_xb_tiao_03","x_xb_tiao_02","x_xb_tiao_01"}, } @@ -93,25 +93,56 @@ function this:SetLevelData(go, data) else tip.text="已通过" end - Util.AddOnceClick(btnFight:GetGameObject("Button"),function() end) + Util.AddOnceClick(btnFight:GetGameObject("Button"),function() + if data.state ==0 then + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.XUANYUAN_MIRROR,curType) + elseif data.state == -1 then + PopupTipPanel.ShowTip("通过上一难度开启") + else + --扫荡 + end + end) local rewardGrid = Util.GetGameObject(go,"Reward") local rewards = {} + local index = 1 for n,m in ipairs(data.rewards) do if m then - if not rewards[n] then - rewards[n] = SubUIManager.Open(SubUIConfig.ItemView,rewardGrid.transform) + --设置概率掉落奖励 + if m.israte then + if not rewards[index] then + rewards[index] = SubUIManager.Open(SubUIConfig.ItemView,rewardGrid.transform) + end + rewards[index]:OnOpen(false, {m.id, m.num}, 1.6, false) + index = index + 1 + local image = Util.GetGameObject(rewards[n],"PreciousShow") + image.gameObject:SetActive(true) + Util.GetGameObject(rewards[n],"PreciousShow/Text").gameObject:SetActive(false) + image:GetComponent("Image").sprite = Util.LoadSprite("x_xianyuan_gailvjiaobiao") end - rewards[n]:OnOpen(false, {m.id, m.num}, 1.6, false) - if m.isFirst or m.israte then - local image = Util.GetGameObject(rewards[n],"PreciousShow") - image.gameObject:SetActive(true) - Util.GetGameObject(rewards[n],"PreciousShow/Text").gameObject:SetActive(false) - if m.isFirst then - image:GetComponent("Image").sprite = Util.LoadSprite("x_xianyuan_shoucijiaobiao") - end - if m.israte then - image:GetComponent("Image").sprite = Util.LoadSprite("x_xianyuan_gailvjiaobiao") - end + --设置首通掉落奖励 + if data.state == -1 or data.state == 0 then + if m.isFirst then + if not rewards[index] then + rewards[index] = SubUIManager.Open(SubUIConfig.ItemView,rewardGrid.transform) + end + rewards[index]:OnOpen(false, {m.id, m.num}, 1.6, false) + index = index + 1 + local image = Util.GetGameObject(rewards[n],"PreciousShow") + image.gameObject:SetActive(true) + Util.GetGameObject(rewards[n],"PreciousShow/Text").gameObject:SetActive(false) + image:GetComponent("Image").sprite = Util.LoadSprite("x_xianyuan_shoucijiaobiao") + end + --设置扫荡掉落奖励 + else + if not m.isFirst and not m.israte then + if not rewards[index] then + rewards[index] = SubUIManager.Open(SubUIConfig.ItemView,rewardGrid.transform) + end + rewards[index]:OnOpen(false, {m.id, m.num}, 1.6, false) + index = index + 1 + local image = Util.GetGameObject(rewards[n],"PreciousShow") + image.gameObject:SetActive(false) + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 31c4ceccbf..d9fb9b6f28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -56,6 +56,7 @@ this.PanelOptionView = { [FORMATION_TYPE.SAVE_FORMATION]="Modules/Formation/View/SaveFormation", [FORMATION_TYPE.GUILD_CAR_DELEAY]="Modules/Formation/View/GuildCarDeleayFormation", [FORMATION_TYPE.GUILD_DEATHPOS]="Modules/Formation/View/GuildDeathPosFormation", + [FORMATION_TYPE.XUANYUAN_MIRROR]="Modules/Formation/View/XuanYuanMirrorFormation", } function this:InitComponent() orginLayer=0 @@ -137,6 +138,9 @@ function this:InitComponent() -- 上阵等级提示 this.formTip = Util.GetGameObject(self.transform, "bottom/formTip") + -- 上阵元素提示 + this.tip = Util.GetGameObject(self.transform, "bottom/tip") + this.tip.gameObject:SetActive(false) this.mopUpGo.transform:SetParent(self.gameObject.transform) this.mopUpGo:SetActive(false) @@ -241,8 +245,6 @@ function this:OnDestroy() this.scrollView = nil end - - --刷新编队 function this.RefreshFormation() proId=0 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index fea32d07f7..90309592ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -653,37 +653,8 @@ function this:BindEvent() this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA) end) Util.AddClick(this.btnColorfulWorld, function() - if ActTimeCtrlManager.SingleFuncState(30) then - CarbonManager.difficulty = 2 - local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig) - - if MapTrialManager.curTowerLevel > 10000 then - MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId() - else - MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId - end - NetManager.MapInfoRequest(MapManager.curMapId, FormationTypeDef.FORMATION_DREAMLAND, function(msg) - MapManager.isReloadEnter = false - MapTrialManager.firstEnter = true - MapManager.SetViewSize(20)--设置视野范围(明雷形式) - MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND - MapManager.trialHeroInfo=msg.infos - SwitchPanel.OpenPanel(UIName.MapPanel) - end) - - - -- local curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId - -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, curMapId) - -- UIManager.OpenPanel(UIName.TrialCarbonPanel) - -- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "Trial", 1) - -- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon) - -- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL) - -- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL) - LogBlue(Language[11163]) - else - PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL)) - end - this.ScenceBtnClick(FUNCTION_OPEN_TYPE.TRIAL) + UIManager.OpenPanel(UIName.CarbonTypePanelV3) + this.ScenceBtnClick(FUNCTION_OPEN_TYPE.XUANYUAN_MIRROR) end) Util.AddClick(this.btnFenjie, function() JumpManager.GoJump(24001) diff --git a/data_execl/base_data/RaceTowerConfig.xlsx b/data_execl/base_data/RaceTowerConfig.xlsx index f1be69a432..911945c92f 100644 Binary files a/data_execl/base_data/RaceTowerConfig.xlsx and b/data_execl/base_data/RaceTowerConfig.xlsx differ diff --git a/data_execl/base_data/RaceTowerRewardConfig.xlsx b/data_execl/base_data/RaceTowerRewardConfig.xlsx index cdb2275e36..4f25019c44 100644 Binary files a/data_execl/base_data/RaceTowerRewardConfig.xlsx and b/data_execl/base_data/RaceTowerRewardConfig.xlsx differ diff --git a/data_execl/base_data/UIConfig.xlsx b/data_execl/base_data/UIConfig.xlsx index 220abc21dd..561ebb29e9 100644 Binary files a/data_execl/base_data/UIConfig.xlsx and b/data_execl/base_data/UIConfig.xlsx differ