diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab index c4a62d2c4c..6884e8b7ab 100644 --- a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab @@ -465,10 +465,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} 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: 104, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &4573983830629001742 CanvasRenderer: @@ -1269,10 +1269,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 580, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4713829247308178245 CanvasRenderer: @@ -1462,10 +1462,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 720, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3043128608018388249 CanvasRenderer: @@ -1774,7 +1774,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6489381859193902079 RectTransform: m_ObjectHideFlags: 0 @@ -3060,10 +3060,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2026494486082166274 CanvasRenderer: @@ -3803,10 +3803,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 440, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &5309317615122532976 CanvasRenderer: @@ -4457,7 +4457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1441774295091081370 RectTransform: m_ObjectHideFlags: 0 @@ -4831,10 +4831,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 608, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &7065973308383303497 CanvasRenderer: @@ -6847,10 +6847,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 440, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3428141315978654585 CanvasRenderer: @@ -9266,10 +9266,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} 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: 272, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &7795520682918704533 CanvasRenderer: @@ -10710,7 +10710,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4608755924365892055 RectTransform: m_ObjectHideFlags: 0 @@ -10726,10 +10726,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 790, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3532145455492184999 CanvasRenderer: @@ -11105,10 +11105,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 776, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &6460921918868668529 CanvasRenderer: @@ -13348,10 +13348,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 300, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5713593700809359769 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index f0f7a63689..65d5d3ff57 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -93,7 +93,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1004934361 RectTransform: m_ObjectHideFlags: 0 @@ -109,10 +109,10 @@ RectTransform: m_Father: {fileID: 5117868206164008583} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 790, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1004934365 CanvasRenderer: @@ -69320,6 +69320,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_LocalPosition.y + value: 43 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -69330,11 +69335,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_LocalPosition.y - value: 43 - objectReference: {fileID: 0} - target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 4614462560..528eaae981 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -2580,7 +2580,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: 54.2, y: -90} + m_AnchoredPosition: {x: 0, y: -90} m_SizeDelta: {x: 16.22, y: 33.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1472422953 @@ -2618,7 +2618,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 8 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -27884,7 +27884,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: 54.2, y: -90} + m_AnchoredPosition: {x: 0, y: -90} m_SizeDelta: {x: 16.22, y: 33.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5920624837821711060 @@ -27922,7 +27922,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 8 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -31725,7 +31725,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 8 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab index cd976b0d01..c62ff8de16 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab @@ -4891,7 +4891,7 @@ ParticleSystem: --- !u!199 &148790109625764326 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9594,7 +9594,7 @@ ParticleSystem: --- !u!199 &4982092013365813535 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14468,7 +14468,7 @@ ParticleSystem: --- !u!199 &9191017234564813313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19917,7 +19917,7 @@ ParticleSystem: --- !u!199 &5056943522526155145 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24684,7 +24684,7 @@ ParticleSystem: --- !u!199 &3785188359994672853 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29522,7 +29522,7 @@ ParticleSystem: --- !u!199 &4162552063939220692 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34270,7 +34270,7 @@ ParticleSystem: --- !u!199 &3520701850680857534 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34690,6 +34690,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3173175823763641480} + - {fileID: 7279314919358853883} + - {fileID: 6897587206964355585} m_Father: {fileID: 5402761081988941873} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39605,7 +39607,7 @@ ParticleSystem: --- !u!199 &2448079648247233803 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44476,7 +44478,7 @@ ParticleSystem: --- !u!199 &2569753523486402195 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50705,7 +50707,7 @@ ParticleSystem: --- !u!199 &7324639803679475557 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55410,7 +55412,7 @@ ParticleSystem: --- !u!199 &7172683182181672100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61679,7 +61681,7 @@ ParticleSystem: --- !u!199 &4265103140430626036 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -67065,7 +67067,7 @@ ParticleSystem: --- !u!199 &4943627185890565814 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72540,7 +72542,7 @@ ParticleSystem: --- !u!199 &6407276649207380679 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77112,7 +77114,7 @@ ParticleSystem: --- !u!199 &6411361250930786800 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -82314,7 +82316,7 @@ ParticleSystem: --- !u!199 &2248187322806398115 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87604,7 +87606,7 @@ ParticleSystem: --- !u!199 &2056578059423130521 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -92682,7 +92684,7 @@ ParticleSystem: --- !u!199 &3120077215394990954 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -92803,6 +92805,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &2427968586445965859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6759969222889688806} + - component: {fileID: 1185041312476493492} + - component: {fileID: 6214794294013794468} + m_Layer: 5 + m_Name: starPre (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6759969222889688806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2427968586445965859} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -222.24022} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6897587206964355585} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 12.500122, y: -12.5} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1185041312476493492 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2427968586445965859} + m_CullTransparentMesh: 0 +--- !u!114 &6214794294013794468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2427968586445965859} + 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: 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_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, 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 &2441788598866290404 GameObject: m_ObjectHideFlags: 0 @@ -98083,7 +98159,7 @@ ParticleSystem: --- !u!199 &7471044272247662300 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -102833,7 +102909,7 @@ ParticleSystem: --- !u!199 &1252519594050884031 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -107914,7 +107990,7 @@ ParticleSystem: --- !u!199 &7728079455863758084 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -107973,6 +108049,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &2793882072492501451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1602991665365440054} + - component: {fileID: 3471896616588271980} + - component: {fileID: 1262013407891571682} + m_Layer: 5 + m_Name: starPre (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1602991665365440054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2793882072492501451} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -222.24023} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6897587206964355585} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 37.5, y: -12.5} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3471896616588271980 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2793882072492501451} + m_CullTransparentMesh: 0 +--- !u!114 &1262013407891571682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2793882072492501451} + 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: 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_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, 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 &2835704561245382765 GameObject: m_ObjectHideFlags: 0 @@ -112833,7 +112983,7 @@ ParticleSystem: --- !u!199 &3045979354143730918 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -118011,7 +118161,7 @@ ParticleSystem: --- !u!199 &3899722718212982798 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -123445,7 +123595,7 @@ ParticleSystem: --- !u!199 &589196844548357803 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -128339,7 +128489,7 @@ ParticleSystem: --- !u!199 &2997530149261667875 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -128821,7 +128971,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 445.6, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 895.3, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8905667472897453265 @@ -133487,7 +133637,7 @@ ParticleSystem: --- !u!199 &5616665529502572980 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -139298,7 +139448,7 @@ ParticleSystem: --- !u!199 &6297049041660232371 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -144437,7 +144587,7 @@ ParticleSystem: --- !u!199 &3061828490372090331 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -144570,6 +144720,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4303721217281624311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3771967189965880532} + - component: {fileID: 6487512716152789111} + - component: {fileID: 2014679962621359606} + m_Layer: 5 + m_Name: levelText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3771967189965880532 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4303721217281624311} + 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: 7279314919358853883} + 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: 0} + m_SizeDelta: {x: 56.81, y: 38.03} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6487512716152789111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4303721217281624311} + m_CullTransparentMesh: 0 +--- !u!114 &2014679962621359606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4303721217281624311} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7490196, g: 0.7921569, b: 0.7921569, 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: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 100 --- !u!1 &4335154955469083846 GameObject: m_ObjectHideFlags: 0 @@ -150128,7 +150357,7 @@ ParticleSystem: --- !u!199 &189638598642628905 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -156538,7 +156767,7 @@ ParticleSystem: --- !u!199 &3668776509587732539 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -161583,7 +161812,7 @@ ParticleSystem: --- !u!199 &1525906973065453500 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -166519,7 +166748,7 @@ ParticleSystem: --- !u!199 &8040976243220094536 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -166996,6 +167225,80 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1.5, y: -1.5} m_UseGraphicAlpha: 1 +--- !u!1 &5324346221782048826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2673197026736045535} + - component: {fileID: 1083987474059525110} + - component: {fileID: 2444018281741136330} + m_Layer: 5 + m_Name: starPre (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2673197026736045535 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5324346221782048826} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -222.2402} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6897587206964355585} + 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: 12.5, y: -12.5} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1083987474059525110 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5324346221782048826} + m_CullTransparentMesh: 0 +--- !u!114 &2444018281741136330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5324346221782048826} + 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: 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_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, 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 &5340851870376561117 GameObject: m_ObjectHideFlags: 0 @@ -167186,6 +167489,80 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &5368132062251610889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5259903876064379675} + - component: {fileID: 3762676364557019011} + - component: {fileID: 7861367630029191894} + m_Layer: 5 + m_Name: starPre (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5259903876064379675 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5368132062251610889} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -222.24023} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6897587206964355585} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 62.49997, y: -12.5} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3762676364557019011 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5368132062251610889} + m_CullTransparentMesh: 0 +--- !u!114 &7861367630029191894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5368132062251610889} + 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: 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_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, 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 &5374050234284923712 GameObject: m_ObjectHideFlags: 0 @@ -171952,7 +172329,7 @@ ParticleSystem: --- !u!199 &6185216823374329277 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -177388,7 +177765,7 @@ ParticleSystem: --- !u!199 &3657988726988831654 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -182455,7 +182832,7 @@ ParticleSystem: --- !u!199 &5068839175535446245 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -188026,7 +188403,7 @@ ParticleSystem: --- !u!199 &2094348334497438208 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -193365,7 +193742,7 @@ ParticleSystem: --- !u!199 &7358211241672181674 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -198147,7 +198524,7 @@ ParticleSystem: --- !u!199 &5247238362140272329 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -198651,6 +199028,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6313380098592132588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7279314919358853883} + - component: {fileID: 3620676461945447433} + - component: {fileID: 6284899508826231035} + m_Layer: 5 + m_Name: lvbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7279314919358853883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6313380098592132588} + m_LocalRotation: {x: -0, y: -0, z: 0.004054589, w: -0.99999183} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.892857, y: 0.892857, z: 0.8333334} + m_Children: + - {fileID: 3771967189965880532} + m_Father: {fileID: 5694951874096333641} + 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: 42.7, y: 52.2} + m_SizeDelta: {x: 50.42, y: 31.52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3620676461945447433 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6313380098592132588} + m_CullTransparentMesh: 0 +--- !u!114 &6284899508826231035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6313380098592132588} + 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: c73ac4f44d9a7194488674d4fa335c10, 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 &6336059050510758321 GameObject: m_ObjectHideFlags: 0 @@ -206824,7 +207276,7 @@ ParticleSystem: --- !u!199 &271453212813778959 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -211576,7 +212028,7 @@ ParticleSystem: --- !u!199 &9024831251810077855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -216317,7 +216769,7 @@ ParticleSystem: --- !u!199 &4374573709437933587 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -220927,7 +221379,7 @@ ParticleSystem: --- !u!199 &5450983251236665416 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -225744,7 +226196,7 @@ ParticleSystem: --- !u!199 &8525895370444853774 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -230986,7 +231438,7 @@ ParticleSystem: --- !u!199 &8690969303022921562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -235936,7 +236388,7 @@ ParticleSystem: --- !u!199 &1007953872804928636 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -236340,6 +236792,72 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7784277127206927706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6897587206964355585} + - component: {fileID: 6360477019409769817} + m_Layer: 5 + m_Name: starGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6897587206964355585 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7784277127206927706} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8108151, y: 0.8108151, z: 0.90000004} + m_Children: + - {fileID: 2673197026736045535} + - {fileID: 2133738087612767972} + - {fileID: 8739031099560246214} + - {fileID: 6759969222889688806} + - {fileID: 1602991665365440054} + - {fileID: 5259903876064379675} + m_Father: {fileID: 5694951874096333641} + m_RootOrder: 2 + 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: 112.87, y: 29.09} + m_Pivot: {x: 0, y: 0} +--- !u!114 &6360477019409769817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7784277127206927706} + 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: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 35, y: 35} + m_Spacing: {x: -6, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &7787356913851541709 GameObject: m_ObjectHideFlags: 0 @@ -241419,7 +241937,7 @@ ParticleSystem: --- !u!199 &825704488939151993 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -246122,7 +246640,7 @@ ParticleSystem: --- !u!199 &8445370598039826089 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -251533,7 +252051,7 @@ ParticleSystem: --- !u!199 &489231107773497802 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -252324,6 +252842,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8361695339529357962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8739031099560246214} + - component: {fileID: 8315591584528958720} + - component: {fileID: 4513856180631683934} + m_Layer: 5 + m_Name: starPre (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8739031099560246214 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8361695339529357962} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -222.24022} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6897587206964355585} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 62.5, y: -12.5} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8315591584528958720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8361695339529357962} + m_CullTransparentMesh: 0 +--- !u!114 &4513856180631683934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8361695339529357962} + 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: 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_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, 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 &8403639128025493501 GameObject: m_ObjectHideFlags: 0 @@ -252359,6 +252951,80 @@ RectTransform: m_AnchoredPosition: {x: -20.109978, y: -15.803642} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!1 &8405854975551195193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2133738087612767972} + - component: {fileID: 2002464730599604304} + - component: {fileID: 7475354809108971514} + m_Layer: 5 + m_Name: starPre (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2133738087612767972 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8405854975551195193} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -222.24022} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6897587206964355585} + 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: 37.5, y: -12.5} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2002464730599604304 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8405854975551195193} + m_CullTransparentMesh: 0 +--- !u!114 &7475354809108971514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8405854975551195193} + 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: 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_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, 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 &8408259171611653879 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab index 13e4dd1b14..ac799d4c59 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab @@ -1626,8 +1626,8 @@ RectTransform: m_Father: {fileID: 6594472603124481167} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 442.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} @@ -1863,9 +1863,9 @@ RectTransform: m_Father: {fileID: 5981932543035177726} 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: 460, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 460, y: -355} m_SizeDelta: {x: 905, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5201084322800259043 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewNewPanel.prefab index 68827f07a0..d37f5ddd8a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewNewPanel.prefab @@ -110,7 +110,7 @@ RectTransform: m_Children: - {fileID: 6367545213903493701} m_Father: {fileID: 761062889225148252} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1537,7 +1537,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7046267262786599789 RectTransform: m_ObjectHideFlags: 0 @@ -1716,7 +1716,7 @@ MonoBehaviour: m_HandleRect: {fileID: 5662496400508578312} m_Direction: 2 m_Value: 1 - m_Size: 0.89621073 + m_Size: 0.7921736 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1817,10 +1817,10 @@ RectTransform: m_Father: {fileID: 8503809972057555249} 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: 428.9, y: -37} - m_SizeDelta: {x: 234, y: 74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 344, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4264153591420441936 CanvasRenderer: @@ -1850,7 +1850,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 328d5a7696e4f324e8246b08477f0ee4, type: 3} + m_Sprite: {fileID: 21300000, guid: 4d19a174476d6044ea678d597933c968, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3089,6 +3089,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8519602078899774996} - {fileID: 7759797600969431214} m_Father: {fileID: 133927059845299505} m_RootOrder: 2 @@ -3121,6 +3122,85 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 1 +--- !u!1 &4224541773598177384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8519602078899774996} + - component: {fileID: 769082743509934315} + - component: {fileID: 1908776433853424592} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8519602078899774996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4224541773598177384} + 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: 761062889225148252} + 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: 160, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &769082743509934315 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4224541773598177384} + m_CullTransparentMesh: 0 +--- !u!114 &1908776433853424592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4224541773598177384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text --- !u!1 &4293146313775758667 GameObject: m_ObjectHideFlags: 0 @@ -5744,7 +5824,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8503809972057555249 RectTransform: m_ObjectHideFlags: 0 @@ -5760,10 +5840,10 @@ RectTransform: m_Father: {fileID: 133927059845299505} 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: 428.9, y: -37} - m_SizeDelta: {x: 857.8, y: 74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 857.8, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7988919876553571695 MonoBehaviour: @@ -5782,7 +5862,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 1 + m_ChildAlignment: 0 m_Spacing: 18.1 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 @@ -6421,7 +6501,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7021039769937866113 RectTransform: m_ObjectHideFlags: 0 @@ -6436,9 +6516,9 @@ RectTransform: m_Father: {fileID: 133927059845299505} 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: 428.9, y: -84.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 857.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &4838038619090972626 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab index d65c1932fe..fbe751b552 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab @@ -392,7 +392,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: -255, y: 44} + m_AnchoredPosition: {x: -288, y: 44} m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &295595729809998905 @@ -430,13 +430,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: "\u5316\u8EAB\u7B49\u7EA7\uFF1A10\u7EA7" LanguageIndex: 0 --- !u!1 &2086951693562488479 GameObject: @@ -1222,7 +1222,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7788528674875234122 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index e90dd5819b..aba5626a83 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -1097,6 +1097,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &690097008634447975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4399893624326727770} + - component: {fileID: 1998244871395157631} + - component: {fileID: 6120474599009053444} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4399893624326727770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690097008634447975} + 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: 5034057634545036541} + 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: 33, y: 36} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1998244871395157631 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690097008634447975} + m_CullTransparentMesh: 0 +--- !u!114 &6120474599009053444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690097008634447975} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &709629512769647371 GameObject: m_ObjectHideFlags: 0 @@ -17523,8 +17597,8 @@ RectTransform: 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: -3.4, y: -1299.1} - m_SizeDelta: {x: 943.8, y: 1241.9} + m_AnchoredPosition: {x: -3.4, y: -1270.4} + m_SizeDelta: {x: 943.8, y: 1184.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5702796606394471450 GameObject: @@ -18681,7 +18755,8 @@ RectTransform: 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_Children: + - {fileID: 4399893624326727770} m_Father: {fileID: 6861030463589856289} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27397,61 +27472,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 6295776807766909175} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 4324329265115015005} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 2781528259337948335} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 2343889590839515304} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 6145708952717555115} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 876505418813667394} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 1834256969512190643} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3351739044862824428} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 8202199843685639574} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 7836538779477677182} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 6295776807766909175} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -27507,80 +27527,69 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 3725140534225795546} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 6295776807766909175} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 4324329265115015005} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 2781528259337948335} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 2343889590839515304} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 6145708952717555115} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 876505418813667394} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 1834256969512190643} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3351739044862824428} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 8202199843685639574} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 7836538779477677182} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 6295776807766909175} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} ---- !u!4 &2153739859858927707 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8838826844710760576 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8678159752464498404 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8358003466797426258 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8202199843685639574 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1834256969512190643 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &876505418813667394 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4324329265115015005 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7836538779477677182 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3351739044862824428 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} --- !u!4 &6295776807766909175 stripped Transform: m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} ---- !u!4 &3725140534225795546 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} --- !u!4 &714544860256979969 stripped Transform: m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, @@ -27599,9 +27608,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} ---- !u!4 &2781528259337948335 stripped +--- !u!4 &9125283564855765219 stripped Transform: - m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3725140534225795546 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8202199843685639574 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2153739859858927707 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1834256969512190643 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &876505418813667394 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} @@ -27617,21 +27656,57 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} +--- !u!4 &8838826844710760576 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3351739044862824428 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} --- !u!4 &4487533983396361074 stripped Transform: m_CorrespondingSourceObject: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} +--- !u!4 &8678159752464498404 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2781528259337948335 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4324329265115015005 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8358003466797426258 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} --- !u!4 &4611028898147459592 stripped Transform: m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} ---- !u!4 &9125283564855765219 stripped +--- !u!4 &7836538779477677182 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} @@ -28207,61 +28282,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 5315419128087558218} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2492782666566270944} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4036007123638014994} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4475475238826983445} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 5463657540003147030} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1347358205666697471} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 571861290136394254} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3465795657564182353} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 8020681561173851435} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8240396197470686403} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 5315419128087558218} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -28317,6 +28337,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 3254244058998022503} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 5315419128087558218} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2492782666566270944} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4036007123638014994} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4475475238826983445} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 5463657540003147030} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1347358205666697471} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 571861290136394254} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3465795657564182353} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 8020681561173851435} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8240396197470686403} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 5315419128087558218} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &2368280217156987855 stripped @@ -28325,12 +28400,72 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} +--- !u!4 &6933497387350454366 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} --- !u!4 &2406774280416967349 stripped Transform: m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} +--- !u!4 &430621551313268376 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7883175047091650287 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7349314633059198581 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1689321469925758140 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5315419128087558218 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8240396197470686403 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2492782666566270944 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3465795657564182353 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &250126608500975846 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} --- !u!4 &7220092645757200445 stripped Transform: m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, @@ -28367,84 +28502,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} ---- !u!4 &4036007123638014994 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3465795657564182353 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2492782666566270944 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8240396197470686403 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5315419128087558218 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1689321469925758140 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7349314633059198581 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &430621551313268376 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7883175047091650287 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} --- !u!4 &7418618800910870105 stripped Transform: m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} ---- !u!4 &250126608500975846 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6933497387350454366 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} --- !u!4 &3254244058998022503 stripped Transform: m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} +--- !u!4 &4036007123638014994 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4597560680341265650 PrefabInstance: m_ObjectHideFlags: 0 @@ -29105,105 +29180,15 @@ PrefabInstance: objectReference: {fileID: 674796108277879238} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &7062020611193656940 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &674796108277879238 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6334557078981197104 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2695246376783269881 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4999157146657883924 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} --- !u!4 &7061616178414555961 stripped Transform: m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} ---- !u!4 &3314608663550711651 stripped +--- !u!4 &2695246376783269881 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!224 &7472721432205563013 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7903842969898256619 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2351382408409831890 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4891421737810608490 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2642380382217241009 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2768949106265165781 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3447045466679366823 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3657686346232358223 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5149543074701112194 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5921026051235449203 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} @@ -29219,6 +29204,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} +--- !u!224 &7472721432205563013 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} --- !u!4 &8690739934298013086 stripped Transform: m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, @@ -29231,6 +29222,90 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} +--- !u!4 &7062020611193656940 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3447045466679366823 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5149543074701112194 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5921026051235449203 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3657686346232358223 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6334557078981197104 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7903842969898256619 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2351382408409831890 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &674796108277879238 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2642380382217241009 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2768949106265165781 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3314608663550711651 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4891421737810608490 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4999157146657883924 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5109917368622536691 PrefabInstance: m_ObjectHideFlags: 0 @@ -29428,61 +29503,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 2806266285432096955} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 5597360233258323729} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 6284547609576056035} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 5848452834717774052} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 2659158206834138599} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 9045254447937409038} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 7555453618687322879} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 6858154372582877088} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 34580444119207386} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 2120686865988467762} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 2806266285432096955} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -29538,77 +29558,78 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 4763841263892746646} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 2806266285432096955} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 5597360233258323729} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 6284547609576056035} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 5848452834717774052} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 2659158206834138599} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 9045254447937409038} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 7555453618687322879} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 6858154372582877088} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 34580444119207386} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 2120686865988467762} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 2806266285432096955} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} ---- !u!4 &2120686865988467762 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7695549904735428201 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5643962156759173700 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &167578942871604766 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} --- !u!4 &1084609921346109615 stripped Transform: m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &703071333314975400 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4763841263892746646 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5848452834717774052 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5757895649623694142 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} --- !u!4 &34580444119207386 stripped Transform: m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &8666149664182101069 stripped +--- !u!4 &7555453618687322879 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5597360233258323729 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} @@ -29624,21 +29645,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &777987356899579524 stripped +--- !u!4 &5848452834717774052 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &794632277214157004 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7803987231298721815 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} @@ -29654,9 +29663,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &7555453618687322879 stripped +--- !u!4 &5597360233258323729 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} @@ -29666,6 +29675,72 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} +--- !u!4 &8666149664182101069 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &777987356899579524 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7695549904735428201 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5643962156759173700 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2120686865988467762 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &703071333314975400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &794632277214157004 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7803987231298721815 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4763841263892746646 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5757895649623694142 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &167578942871604766 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6372924337174286158 PrefabInstance: m_ObjectHideFlags: 0 @@ -30113,61 +30188,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 1565341096835020056} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 9143776497150767794} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 7241748616777406784} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 7088958161159490887} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 1706815271493689412} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 5678999280286363053} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 6598534555583518556} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 7810902215159585283} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 3689067693553004665} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 3325583184555016593} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 1565341096835020056} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -30223,32 +30243,87 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 8166285465235942453} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 1565341096835020056} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 9143776497150767794} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 7241748616777406784} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 7088958161159490887} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 1706815271493689412} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 5678999280286363053} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 6598534555583518556} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 7810902215159585283} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 3689067693553004665} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 3325583184555016593} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 1565341096835020056} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} ---- !u!4 &7810902215159585283 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7088958161159490887 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9143776497150767794 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} --- !u!4 &3325583184555016593 stripped Transform: m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} +--- !u!4 &1565341096835020056 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5678999280286363053 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3689067693553004665 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} --- !u!4 &5407890813093927406 stripped Transform: m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, @@ -30261,45 +30336,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} ---- !u!4 &6450558618364666826 stripped +--- !u!4 &1706815271493689412 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9014949244760422375 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3538621045786063805 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4217944966938356491 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6847085743169381812 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3689067693553004665 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6598534555583518556 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 8460207014433947514, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} @@ -30309,21 +30348,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} ---- !u!4 &1706815271493689412 stripped +--- !u!4 &7088958161159490887 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8460207014433947514, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4057726660170409327 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5678999280286363053 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} @@ -30333,15 +30360,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} +--- !u!4 &7810902215159585283 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} --- !u!4 &4343061878152183052 stripped Transform: m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} ---- !u!4 &1565341096835020056 stripped +--- !u!4 &6847085743169381812 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4057726660170409327 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4217944966938356491 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} @@ -30351,6 +30396,36 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} +--- !u!4 &3538621045786063805 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9143776497150767794 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9014949244760422375 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6450558618364666826 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6598534555583518556 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7183467851596501408 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpHelpPopup.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpHelpPopup.prefab index 1a16aca834..92692c430b 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpHelpPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpHelpPopup.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1154903401261195961 +--- !u!1 &33202164045123846 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,104 +8,294 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5962677251518271909} - - component: {fileID: 8092669724519352780} + - component: {fileID: 2018642857379067804} + - component: {fileID: 7279734125813089561} + - component: {fileID: 2712843863047651233} m_Layer: 5 - m_Name: proScrollgrid1 + m_Name: propText (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5962677251518271909 +--- !u!224 &2018642857379067804 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154903401261195961} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99992025, y: 0.99992025, z: 0.99992025} - m_Children: [] - m_Father: {fileID: 8495793907540090995} - 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: 52.877014, y: -312.90015} - m_SizeDelta: {x: 703.62, y: 214.2} - m_Pivot: {x: 0, y: 1} ---- !u!114 &8092669724519352780 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154903401261195961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, 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 &2847623196703247819 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 911510529662743022} - - component: {fileID: 5871404675551923469} - - component: {fileID: 9069149034759007142} - m_Layer: 5 - m_Name: proScrollgrid2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &911510529662743022 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2847623196703247819} + m_GameObject: {fileID: 33202164045123846} 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: 5942610546575564899} - m_RootOrder: 0 + m_Father: {fileID: 19488012686417471} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 361.65, y: -0.000059345926} - m_SizeDelta: {x: 723.3, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &5871404675551923469 + 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 &7279734125813089561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33202164045123846} + m_CullTransparentMesh: 0 +--- !u!114 &2712843863047651233 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2847623196703247819} + m_GameObject: {fileID: 33202164045123846} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 1, b: 0.029838085, 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 66 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u653B\u51FB+1000" +--- !u!1 &1667706808754419057 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4596393751241354028} + - component: {fileID: 2742731299788029723} + - component: {fileID: 1499918223989577616} + m_Layer: 5 + m_Name: skillDes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4596393751241354028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667706808754419057} + 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: 6013867569192212373} + 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} + m_AnchoredPosition: {x: 15.1, y: -156.96997} + m_SizeDelta: {x: 675, y: 225.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2742731299788029723 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667706808754419057} + m_CullTransparentMesh: 0 +--- !u!114 &1499918223989577616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667706808754419057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.066497564, g: 1, b: 0, 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 66 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6548\u679C\uFF1A\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9" +--- !u!1 &2634955535103911348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7948297873718366868} + - component: {fileID: 5671537181504469411} + - component: {fileID: 7464822207321502506} + m_Layer: 5 + m_Name: propTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7948297873718366868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2634955535103911348} + 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: 6786801156902737832} + 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: -267, y: 54.1} + m_SizeDelta: {x: 127.4, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5671537181504469411 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2634955535103911348} + m_CullTransparentMesh: 0 +--- !u!114 &7464822207321502506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2634955535103911348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.066497564, g: 1, b: 0, 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 66 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5C5E\u6027\uFF1A" +--- !u!1 &3369112589013887254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 19488012686417471} + - component: {fileID: 3213705485866556416} + - component: {fileID: 6936015988582148954} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &19488012686417471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369112589013887254} + 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: 2765577063788541570} + - {fileID: 1281514394737900478} + - {fileID: 7266457797905736689} + - {fileID: 2018642857379067804} + m_Father: {fileID: 6786801156902737832} + 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: 125.6, y: -3.3} + m_SizeDelta: {x: 650.4, y: 171.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3213705485866556416 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369112589013887254} + m_CullTransparentMesh: 0 +--- !u!114 &6936015988582148954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369112589013887254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -114,26 +304,13 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 53.02 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 ---- !u!114 &9069149034759007142 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2847623196703247819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!1 &3359697916152612687 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 260, y: 60} + m_Spacing: {x: 60, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &3815689436811551669 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -141,10 +318,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4203875127824986231} - - component: {fileID: 8462927877953047810} - - component: {fileID: 548874458965426664} - - component: {fileID: 8512562829585318492} + - component: {fileID: 4349368359188935418} + - component: {fileID: 1931385514362249539} + - component: {fileID: 3395247488506884321} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -152,40 +328,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4203875127824986231 +--- !u!224 &4349368359188935418 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3359697916152612687} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 3815689436811551669} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9999205, y: 0.9999205, z: 0.9999205} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8495793907540090995} - m_RootOrder: 1 + m_Father: {fileID: 6888126714174559119} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52.877026, y: -459.2291} - m_SizeDelta: {x: 632.2, y: 2} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &8462927877953047810 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -52} + m_SizeDelta: {x: 789.2, y: 524.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1931385514362249539 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3359697916152612687} + m_GameObject: {fileID: 3815689436811551669} m_CullTransparentMesh: 0 ---- !u!114 &548874458965426664 +--- !u!114 &3395247488506884321 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3359697916152612687} + m_GameObject: {fileID: 3815689436811551669} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -193,13 +369,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + 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: 21e18b4111348a64684763f0a33d142c, type: 3} + m_Sprite: {fileID: 21300000, guid: b33d91a1856c3584f99176a3f1ecf5fc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -208,27 +384,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &8512562829585318492 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3359697916152612687} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &4836138792919149510 +--- !u!1 &4354836932423078219 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -236,58 +392,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5505493562839872448} - - component: {fileID: 8617766374791507576} - - component: {fileID: 1217382413745837880} - - component: {fileID: 4014571805050260344} + - component: {fileID: 1281514394737900478} + - component: {fileID: 2857222986436552348} + - component: {fileID: 2984223505069253359} m_Layer: 5 - m_Name: content + m_Name: propText (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5505493562839872448 +--- !u!224 &1281514394737900478 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4836138792919149510} + m_GameObject: {fileID: 4354836932423078219} 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: 5076198630459913303} - m_RootOrder: 2 + m_Father: {fileID: 19488012686417471} + 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: 640, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!222 &8617766374791507576 + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2857222986436552348 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4836138792919149510} + m_GameObject: {fileID: 4354836932423078219} m_CullTransparentMesh: 0 ---- !u!114 &1217382413745837880 +--- !u!114 &2984223505069253359 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4836138792919149510} + m_GameObject: {fileID: 4354836932423078219} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 1, b: 0.029838085, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -295,145 +450,19 @@ MonoBehaviour: 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: 32 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 + m_MaxSize: 66 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: ---- !u!114 &4014571805050260344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4836138792919149510} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!1 &5145513416512958182 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5942610546575564899} - - component: {fileID: 666249913675758550} - - component: {fileID: 3221429973461410046} - - component: {fileID: 5475277089232462767} - - component: {fileID: 8249781390948213265} - m_Layer: 5 - m_Name: proScroll - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5942610546575564899 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5145513416512958182} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99992025, y: 0.99992025, z: 0.99992025} - m_Children: - - {fileID: 911510529662743022} - m_Father: {fileID: 8495793907540090995} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 387, y: 0.00018310547} - m_SizeDelta: {x: 706.8, y: 932.24} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &666249913675758550 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5145513416512958182} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 911510529662743022} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 0} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!222 &3221429973461410046 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5145513416512958182} - m_CullTransparentMesh: 0 ---- !u!114 &5475277089232462767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5145513416512958182} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 ---- !u!114 &8249781390948213265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5145513416512958182} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Text: "\u653B\u51FB+1000" --- !u!1 &5461858442643394470 GameObject: m_ObjectHideFlags: 0 @@ -466,11 +495,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6888126714174559119} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -30, y: -15} + m_AnchoredPosition: {x: -48.5, y: -33.7} m_SizeDelta: {x: 142, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &960423088776220107 @@ -571,80 +600,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &5706978740832256121 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4433645350708751627} - - component: {fileID: 7584927738549287235} - - component: {fileID: 7513846353009650313} - m_Layer: 5 - m_Name: fenge - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4433645350708751627 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5706978740832256121} - 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: 5076198630459913303} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 22.5} - m_SizeDelta: {x: 632.2, y: 2} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &7584927738549287235 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5706978740832256121} - m_CullTransparentMesh: 0 ---- !u!114 &7513846353009650313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5706978740832256121} - 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: 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_Sprite: {fileID: 21300000, guid: 21e18b4111348a64684763f0a33d142c, 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 &5794519113580741025 GameObject: m_ObjectHideFlags: 0 @@ -676,10 +631,11 @@ RectTransform: m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203} m_Children: - {fileID: 6013773562088398287} - - {fileID: 5076198630459913303} - {fileID: 6888126714174559119} - - {fileID: 8495793907540090995} - - {fileID: 4802245183887554531} + - {fileID: 5333196371981218126} + - {fileID: 5326869500111421911} + - {fileID: 6786801156902737832} + - {fileID: 4596393751241354028} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -851,192 +807,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &5917645874778096372 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5076198630459913303} - - component: {fileID: 6877881991751749838} - - component: {fileID: 5210646129524282579} - m_Layer: 5 - m_Name: pro - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5076198630459913303 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5917645874778096372} - 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: 8179456307073968399} - - {fileID: 1608055052085787924} - - {fileID: 5505493562839872448} - - {fileID: 4433645350708751627} - m_Father: {fileID: 6013867569192212373} - 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: -4706, y: -476} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &6877881991751749838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5917645874778096372} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &5210646129524282579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5917645874778096372} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, 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: 10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 ---- !u!1 &6928930405158089985 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4802245183887554531} - - component: {fileID: 56654161169544512} - - component: {fileID: 2664304340632427376} - - component: {fileID: 5757595636326396413} - m_Layer: 5 - m_Name: emptyBtn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4802245183887554531 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6928930405158089985} - 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: 6013867569192212373} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 166.9} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &56654161169544512 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6928930405158089985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5757595636326396413} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!222 &2664304340632427376 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6928930405158089985} - m_CullTransparentMesh: 0 ---- !u!114 &5757595636326396413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6928930405158089985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &6995970723649002454 GameObject: m_ObjectHideFlags: 0 @@ -1066,16 +836,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8592225149405351388} - {fileID: 5951136138693891438} - {fileID: 2958635878232847690} + - {fileID: 4349368359188935418} m_Father: {fileID: 6013867569192212373} - m_RootOrder: 2 + 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: 0.14, y: 123.6} - m_SizeDelta: {x: 822, y: 1090.7} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 920, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4273004747558236084 CanvasRenderer: @@ -1105,7 +875,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} + m_Sprite: {fileID: 21300000, guid: 60da54ea70faabc49823d0462d3ae80d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1114,7 +884,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7201427455060439593 +--- !u!1 &7214892762538413797 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1122,170 +892,156 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8179456307073968399} - - component: {fileID: 5815057805232123211} - - component: {fileID: 5137508892206698340} - - component: {fileID: 8052923082026618844} + - component: {fileID: 2765577063788541570} + - component: {fileID: 3586909739608712988} + - component: {fileID: 5396458449359396070} m_Layer: 5 - m_Name: Image + m_Name: propText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8179456307073968399 +--- !u!224 &2765577063788541570 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7201427455060439593} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 7214892762538413797} + 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: 5076198630459913303} + m_Father: {fileID: 19488012686417471} 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: 0, y: 22.5} - m_SizeDelta: {x: 632.2, y: 2} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &5815057805232123211 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7201427455060439593} - m_CullTransparentMesh: 0 ---- !u!114 &5137508892206698340 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7201427455060439593} - 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: 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_Sprite: {fileID: 21300000, guid: 21e18b4111348a64684763f0a33d142c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &8052923082026618844 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7201427455060439593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &7896830492427202951 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8495793907540090995} - - component: {fileID: 166207474273537691} - - component: {fileID: 8934072179147715126} - m_Layer: 5 - m_Name: scroll - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8495793907540090995 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896830492427202951} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799} - m_Children: - - {fileID: 5962677251518271909} - - {fileID: 4203875127824986231} - - {fileID: 5942610546575564899} - m_Father: {fileID: 6013867569192212373} - 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} - m_AnchoredPosition: {x: 8.1, y: 82.4} - m_SizeDelta: {x: 756.4, y: 967.6} + 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 &166207474273537691 +--- !u!222 &3586909739608712988 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896830492427202951} + m_GameObject: {fileID: 7214892762538413797} m_CullTransparentMesh: 0 ---- !u!114 &8934072179147715126 +--- !u!114 &5396458449359396070 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896830492427202951} - m_Enabled: 0 + m_GameObject: {fileID: 7214892762538413797} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 1, b: 0.029838085, 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: 58c503111f310224a9a04ab39a004308, 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 + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 66 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u653B\u51FB+1000" +--- !u!1 &7933398263766440361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7266457797905736689} + - component: {fileID: 940079864472074046} + - component: {fileID: 3995343227711435787} + m_Layer: 5 + m_Name: propText (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7266457797905736689 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7933398263766440361} + 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: 19488012686417471} + m_RootOrder: 2 + 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.5, y: 0.5} +--- !u!222 &940079864472074046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7933398263766440361} + m_CullTransparentMesh: 0 +--- !u!114 &3995343227711435787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7933398263766440361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 1, b: 0.029838085, 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 66 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u653B\u51FB+1000" --- !u!1 &7965312658025915720 GameObject: m_ObjectHideFlags: 0 @@ -1316,11 +1072,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6888126714174559119} - m_RootOrder: 2 + m_RootOrder: 1 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: -4.95, y: -45.1} + m_AnchoredPosition: {x: -4.95, y: -45} m_SizeDelta: {x: 702.3, y: 90.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7029485225413958912 @@ -1344,7 +1100,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.78039217, g: 0.5019608, b: 0.003921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1353,7 +1109,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 57 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -1364,8 +1120,8 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7B49\u7EA7\u52A0\u6210\u8BE6\u60C5" ---- !u!1 &8337231510867791010 + m_Text: "\u6EE1\u7EA7\u52A0\u6210\u9884\u89C8" +--- !u!1 &8177068529012540780 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1373,50 +1129,122 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8592225149405351388} - - component: {fileID: 1785188591298978299} - - component: {fileID: 6545653716186352121} + - component: {fileID: 5326869500111421911} + - component: {fileID: 8653944307383921909} + - component: {fileID: 1467852905435789461} m_Layer: 5 - m_Name: BGImage + m_Name: maxStar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8592225149405351388 +--- !u!224 &5326869500111421911 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8337231510867791010} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8177068529012540780} + 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: 6888126714174559119} - m_RootOrder: 0 + m_Children: + - {fileID: 3057938159168777605} + - {fileID: 5849587362301269875} + - {fileID: 8112703959684203346} + m_Father: {fileID: 6013867569192212373} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -48.5} - m_SizeDelta: {x: -26, y: -123} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 240, y: 158} + m_SizeDelta: {x: 702.3, y: 90.099976} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1785188591298978299 +--- !u!222 &8653944307383921909 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8337231510867791010} + m_GameObject: {fileID: 8177068529012540780} m_CullTransparentMesh: 0 ---- !u!114 &6545653716186352121 +--- !u!114 &1467852905435789461 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8337231510867791010} + m_GameObject: {fileID: 8177068529012540780} + 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: 70, y: 70} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &8490836849127795295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5849587362301269875} + - component: {fileID: 8431175292870663279} + - component: {fileID: 886411785348340583} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5849587362301269875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8490836849127795295} + 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: 5326869500111421911} + 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.5, y: 0.5} +--- !u!222 &8431175292870663279 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8490836849127795295} + m_CullTransparentMesh: 0 +--- !u!114 &886411785348340583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8490836849127795295} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1430,7 +1258,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9658c5a8f1777e74d9a8915414aaa5ac, type: 3} + m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1439,7 +1267,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8624132694121180904 +--- !u!1 &8953894442619638455 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1447,59 +1275,178 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1608055052085787924} - - component: {fileID: 4635076105771293544} - - component: {fileID: 520121121964758341} - - component: {fileID: 2333975026955127307} + - component: {fileID: 3057938159168777605} + - component: {fileID: 3642189095773814499} + - component: {fileID: 3425014661254015233} m_Layer: 5 - m_Name: title + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1608055052085787924 +--- !u!224 &3057938159168777605 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8624132694121180904} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 8953894442619638455} + 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: 5076198630459913303} - m_RootOrder: 1 + m_Father: {fileID: 5326869500111421911} + 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 &4635076105771293544 + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3642189095773814499 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8624132694121180904} + m_GameObject: {fileID: 8953894442619638455} m_CullTransparentMesh: 0 ---- !u!114 &520121121964758341 +--- !u!114 &3425014661254015233 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8624132694121180904} + m_GameObject: {fileID: 8953894442619638455} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 8908080ead3926f4e9e9951397b9e29b, 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 &8968067288047376923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6786801156902737832} + - component: {fileID: 7856522173456939891} + m_Layer: 5 + m_Name: propLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6786801156902737832 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8968067288047376923} + 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: 7948297873718366868} + - {fileID: 19488012686417471} + m_Father: {fileID: 6013867569192212373} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 8.0974, y: 12} + m_SizeDelta: {x: 756.4, y: 212.15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7856522173456939891 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8968067288047376923} + m_CullTransparentMesh: 0 +--- !u!1 &9183465173304212623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5333196371981218126} + - component: {fileID: 7713650689983245829} + - component: {fileID: 4735799374051669192} + m_Layer: 5 + m_Name: maxLevel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5333196371981218126 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9183465173304212623} + 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: 6013867569192212373} + 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: -39, y: 153} + m_SizeDelta: {x: 394, y: 90.099976} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7713650689983245829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9183465173304212623} + m_CullTransparentMesh: 0 +--- !u!114 &4735799374051669192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9183465173304212623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 1, b: 0.010393143, a: 1} + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1507,29 +1454,89 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 45 + m_MaxSize: 66 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u603B\u597D\u611F\u5EA6\u5C5E\u6027" ---- !u!114 &2333975026955127307 + m_Text: "30\u7EA7" +--- !u!1 &9221891499710000769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8112703959684203346} + - component: {fileID: 2187291117762275394} + - component: {fileID: 1020682045865302317} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8112703959684203346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9221891499710000769} + 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: 5326869500111421911} + m_RootOrder: 2 + 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.5, y: 0.5} +--- !u!222 &2187291117762275394 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9221891499710000769} + m_CullTransparentMesh: 0 +--- !u!114 &1020682045865302317 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8624132694121180904} + m_GameObject: {fileID: 9221891499710000769} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 + 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: 8908080ead3926f4e9e9951397b9e29b, 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 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab index 22720fe01f..73fa244eea 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab @@ -702,7 +702,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7269427067276365907 RectTransform: m_ObjectHideFlags: 0 @@ -719,7 +719,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: 0, y: 0} + m_AnchoredPosition: {x: 1000, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7145830168866473298 @@ -1242,6 +1242,77 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 2 LanguageIndex: 11153 +--- !u!1 &1905023786419678797 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1599235319721044276} + - component: {fileID: 4816911412816564728} + - component: {fileID: 3485281825267243244} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1599235319721044276 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1905023786419678797} + 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: 8639712862066127290} + - {fileID: 4349435057242980958} + m_Father: {fileID: 7137997478059132504} + 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 &4816911412816564728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1905023786419678797} + m_CullTransparentMesh: 0 +--- !u!114 &3485281825267243244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1905023786419678797} + 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 &2049734638794833043 GameObject: m_ObjectHideFlags: 0 @@ -1424,7 +1495,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: 0, y: 616} + m_AnchoredPosition: {x: 0, y: 701} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7281633677771163569 @@ -1808,6 +1879,87 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2912238614490091422} m_CullTransparentMesh: 0 +--- !u!1 &3102104419359442846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4349435057242980958} + - component: {fileID: 2649783881678316887} + - component: {fileID: 7502604450506714640} + m_Layer: 5 + m_Name: nextDrop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4349435057242980958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3102104419359442846} + 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: 306798219641298668} + m_Father: {fileID: 1599235319721044276} + 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.5, y: 0.5} +--- !u!222 &2649783881678316887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3102104419359442846} + m_CullTransparentMesh: 0 +--- !u!114 &7502604450506714640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3102104419359442846} + 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, g: 1, b: 0, 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +1000 + LanguageIndex: 11153 --- !u!1 &3128700092930898251 GameObject: m_ObjectHideFlags: 0 @@ -2077,7 +2229,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: 416.99994, y: 616} + m_AnchoredPosition: {x: 416.99994, y: 701} m_SizeDelta: {x: 142, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2870669693644151399 @@ -2209,7 +2361,7 @@ RectTransform: - {fileID: 309928333} - {fileID: 13993384408737725} m_Father: {fileID: 3747604606915676520} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2304,6 +2456,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u751F\u547D\uFF1A5000" LanguageIndex: 11153 +--- !u!1 &3753220948812162509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8376817592732234540} + - component: {fileID: 7487897706678609143} + - component: {fileID: 6828757992982401681} + m_Layer: 5 + m_Name: forceUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8376817592732234540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753220948812162509} + 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: 7621935699000233553} + m_Father: {fileID: 7137997478059132504} + 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: -9.5, y: 20.999817} + m_SizeDelta: {x: 580, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7487897706678609143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753220948812162509} + m_CullTransparentMesh: 0 +--- !u!114 &6828757992982401681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753220948812162509} + 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 &4161217518857284297 GameObject: m_ObjectHideFlags: 0 @@ -2384,6 +2611,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 1000 LanguageIndex: 11153 +--- !u!1 &4298008520304065127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8639712862066127290} + - component: {fileID: 4602249034998197443} + - component: {fileID: 6213240644364036334} + m_Layer: 5 + m_Name: curDrop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8639712862066127290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4298008520304065127} + 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: 1599235319721044276} + 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.5, y: 0.5} +--- !u!222 &4602249034998197443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4298008520304065127} + m_CullTransparentMesh: 0 +--- !u!114 &6213240644364036334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4298008520304065127} + 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.9622642, g: 0.88404447, b: 0.7307761, 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: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 500 + LanguageIndex: 11153 --- !u!1 &4459238910408490673 GameObject: m_ObjectHideFlags: 0 @@ -2770,6 +3077,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5168\u4F53\u5C5E\u6027\u63D0\u5347" +--- !u!1 &4727334835831721925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 306798219641298668} + - component: {fileID: 7211186884679260515} + - component: {fileID: 6175454158939651314} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &306798219641298668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727334835831721925} + 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: 4349435057242980958} + 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: -223, y: 0} + m_SizeDelta: {x: 122, y: 110.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7211186884679260515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727334835831721925} + m_CullTransparentMesh: 0 +--- !u!114 &6175454158939651314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727334835831721925} + 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: f9398964d6d4cdf4db9b39ec0fc5f348, 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 &4955656821216266653 GameObject: m_ObjectHideFlags: 0 @@ -4060,7 +4441,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 920, y: 1336} + m_SizeDelta: {x: 920, y: 1500.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7368232595790026856 CanvasRenderer: @@ -4091,7 +4472,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4185,6 +4566,52 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &7503000983572886954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7137997478059132504} + - component: {fileID: 6884981510677940618} + m_Layer: 5 + m_Name: forceLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7137997478059132504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7503000983572886954} + 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: 8376817592732234540} + - {fileID: 1599235319721044276} + m_Father: {fileID: 3747604606915676520} + m_RootOrder: 2 + 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: 800.6, y: 163.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6884981510677940618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7503000983572886954} + m_CullTransparentMesh: 0 --- !u!1 &7516005029441787767 GameObject: m_ObjectHideFlags: 0 @@ -4217,7 +4644,7 @@ RectTransform: - {fileID: 1811486981567623331} - {fileID: 4095452165657825508} m_Father: {fileID: 3747604606915676520} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4232,6 +4659,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7516005029441787767} m_CullTransparentMesh: 0 +--- !u!1 &7590379886607437387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7621935699000233553} + - component: {fileID: 8492097581692081895} + - component: {fileID: 4026185140055955233} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7621935699000233553 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590379886607437387} + 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: 8376817592732234540} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8492097581692081895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590379886607437387} + m_CullTransparentMesh: 0 +--- !u!114 &4026185140055955233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590379886607437387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21176472, g: 0.16078432, b: 0.10980393, 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: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5316\u8EAB\u4E4B\u529B" --- !u!1 &7713263097649598547 GameObject: m_ObjectHideFlags: 0 @@ -4425,6 +4931,7 @@ RectTransform: m_Children: - {fileID: 1116588779719440858} - {fileID: 6304393456673193057} + - {fileID: 7137997478059132504} - {fileID: 6431628141810528646} - {fileID: 7641017260553095228} m_Father: {fileID: 2745314713354444472} @@ -4432,7 +4939,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: 0, y: -62.5} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 900, y: 1211} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7744938814033924867 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 8b0707792f..f99e25f135 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -490,6 +490,7 @@ PanelType = { fagncunxunbao = {16,1288,1290}, HomeLand = {14,16,12061,12062}, ExploreFun = { 14, 16, 12061 }, -- 体力 2 + GodPrint = { 14, 16, 1294 }, -- 神印 } @@ -786,6 +787,7 @@ RedPointType = { Shop_Tab_General = 25310, Shop_Tab_Soul = 25320, Shop_Tab_Secret = 25321, + Shop_Tab_God = 25322,--神印页签 Shop_Tab_Arena = 25330, Shop_Tab_Guild = 25331, Shop_Tab_Roam = 25350, @@ -793,6 +795,7 @@ RedPointType = { Shop_General_Check = 253100, Shop_General_Refresh = 253101, Shop_Soul_Refresh = 253102, + Shop_God_Refresh = 253103,--神印红点 Shop_Secret_Check = 253200, Shop_Arena_Check = 253300, Shop_Guild_Check = 253310, @@ -1037,6 +1040,7 @@ RedPointType = { incarnation_demon = 43804, incarnation_taoist = 43805, tiandihonglu = 43806, + incarnation_force = 43807,--化身之力红点 recruitTreasure = 7010, recruitTreasure_one = 7011, @@ -1693,12 +1697,15 @@ FUNCTION_OPEN_TYPE = { WEEK_CARD = 117, -- 周卡 LINGMAIMIJING = 118,--灵脉秘境 TailsmanSoul = 119, - Incarnation = 120, + Incarnation = 120, --身外化身 ChouJiangRukou = 121,--限时招募,乾坤宝盒、灵兽宝阁入口 Explore = 123, Gem = 122,--命格 - FlyUp = 125,--飞升 HOMELAND = 124,--家园 浮生们 + FlyUp = 125,--飞升 + GodPrint=126,--神印 + CROSS_CART=127,--跨服聊天 + CROSS_RANK=128,--跨服排行榜 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 174d674db3..d52f193482 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2693,3 +2693,41 @@ function ConnectTable(curTable,targetTable) end return curTable end + +---检测功能开启方法 +function CheckFunctionOpen(_funId) + local data = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,_funId) + -- 当前玩家等级 + local playerLv = PlayerManager.level + --开启规则 + --1关卡开启 + --2玩家等级开启 + --3鸿蒙阵神将等级 + local openRule = data.OpenRules + if openRule then + if openRule[1] == 1 and not FightPointPassManager.IsFightPointPass(openRule[2]) then -- 关卡开启 + return false + elseif openRule[1] == 2 and playerLv < openRule[2] then -- 等级开启 + return false + elseif openRule[1] == 3 and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) < openRule[2] then -- 鸿蒙阵神将共鸣等级 + return false + end + end + --1#创角 + --2#开服 + local curTime=GetTimeStamp() + if data.IfOpen then + local type=data.IfOpen[1] + local dayNum=data.IfOpen[2] + if type==1 then + if curTime2 then return @@ -11307,14 +11317,21 @@ local passivityList = { if not skill or skill.type~=BattleSkillType.Special or skill.isAdd then return end + if isTrigger then + return + end if num>=time then return end + if triggerSkill then + return + end BattleUtil.RandomAction(p1,function() role:AddSuperSkill(false,true,nil,false,false,p2) + triggerSkill=skill num=num+1 end) - + isTrigger=true end role.Event:AddEvent(BattleEventName.RoleDamageBefore,onDamageBefore,nil,nil,role) --处理治疗技能 @@ -11325,13 +11342,21 @@ local passivityList = { if not skill or skill.type~=BattleSkillType.Special or skill.isAdd then return end + if isTrigger then + return + end if num>=time then return end + if triggerSkill then + return + end BattleUtil.RandomAction(p1,function() role:AddSuperSkill(false,true,nil,false,false,p2) + triggerSkill=skill num=num+1 end) + isTrigger=true end role.Event:AddEvent(BattleEventName.PassiveTreatingFactor,OnTreatSkill,nil,nil,role) @@ -11339,6 +11364,12 @@ local passivityList = { num=0 end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role) + local OnSkillCast=function() + triggerSkill=nil + isTrigger=false + end + + role.Event:AddEvent(BattleEventName.SkillCastBefore,OnSkillCast,nil,nil,role) end, diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua index df5a9332c1..bb51dc8df4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua @@ -252,11 +252,11 @@ function this.SetData(root, data) if type==1 or type==2 then goBtnText.text=Language[10287] goBtnImage.sprite=this.spLoader:LoadSprite("s_slbz_1anniuhuangse") - power.text = _power--string.format(Language[10288], _power) + power.text = _power tip.gameObject:SetActive(false) + goIcon:SetActive(isOpen and freeTime<=0) + goIconNum:SetActive( isOpen and freeTime<=0) if type==2 then - goIcon:SetActive(isOpen and freeTime<=0) - goIconNum:SetActive( isOpen and freeTime<=0) goBtnText.text=Language[10289] goBtnImage.sprite=this.spLoader:LoadSprite("s_slbz_1anniuhuise") tip.text=Language[10290] @@ -350,7 +350,13 @@ end ---检测tab是否锁定 function this.TabIsLockCheck(index) if CarbonManager.challengeCopyDataTable[index].openState==0 then - return true,"副本未开启" + local tipStr="" + if CarbonManager.challengeCopyDataTable[index].type==1 then + tipStr="副本每周一,三,五,七开启" + else + tipStr="副本每周二,四,六,七开启" + end + return true,tipStr end return false end diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 982a4dd41f..b4623143a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -222,8 +222,14 @@ function CarbonsPanel:TipShow(_go,_value) self.timeList[_value.id].TextObj = timeText self.timeList[_value.id].Text = "剩余时间:" self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 - 300 - elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL then--无尽副本\森罗幻境 - time:SetActive(false) + elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS then + time:SetActive(true) + self.timeList[_value.id] = {} + self.timeList[_value.id].TextObj = timeText + self.timeList[_value.id].Text = "剩余时间:" + self.timeList[_value.id].time = CalculateSecondsNowTo_N_OClock(0) + elseif _value.id == FUNCTION_OPEN_TYPE.TRIAL then--无尽副本\森罗幻境 + time:SetActive(true) self.timeList[_value.id] = {} self.timeList[_value.id].TextObj = timeText self.timeList[_value.id].Text = "剩余时间:" @@ -366,7 +372,6 @@ function CarbonsPanel:BtnClick(id) -- MapManager.SetViewSize(3)--设置视野范围(明雷形式) -- MapManager.isTimeOut = false -- UIManager.OpenPanel(UIName.EndLessCarbonPanel) - Log("~~~~~~~~~~~~~~~~~~打卡打卡") UIManager.OpenPanel(UIName.ChallengeCopyPanel) else PopupTipPanel.ShowTip(Language[10281]) diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index 13cf4dbc25..00a85914f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -111,7 +111,7 @@ function this.IsChannelOpen(channel) end elseif channel == CHAT_CHANNEL.JUMP_SERVER then -- 开服前七天, 未跨服都显示未跨服 - if GetTimeStamp() - PlayerManager.GetServerOpenTime() < 7*24*60*60 or PlayerManager.isCross == 0 then + if not CheckFunctionOpen(FUNCTION_OPEN_TYPE.CROSS_CART) or PlayerManager.isCross == 0 then return false, "未划分跨服分组" end end diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua index 6710736e8f..1460e8af38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua @@ -90,7 +90,8 @@ function ExploreMainPanel:InitComponent() self.rankBtn:SetActive(false) self.taskBtn = Util.GetGameObject(self.gameObject, "btns/taskBtn") self.taskBtn:SetActive(false) - self.shopBtn = Util.GetGameObject(self.gameObject, "btns/shopBtn") + self.shopBtn = Util.GetGameObject(self.gameObject, "btns/shopBtn") + self.shopBtn:SetActive(false) end --绑定事件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index d3b4f1f756..a43f1b98cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -376,12 +376,14 @@ function this.RequestGetDailyReward(func) end Timer.New(function() NetManager.GetHardStageDailyReward(function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(buyPriId,1) + PrivilegeManager.RefreshPrivilegeUsedTimes(freePriId,1)--记录抽卡次数 + --PrivilegeManager.RefreshPrivilegeUsedTimes(buyPriId,1) -- 刷新红点状态 CheckRedPointStatus(RedPointType.FightLevelDailyReward) -- 触发状态改变 Game.GlobalEvent:DispatchEvent(GameEvent.FightLevel.DailyRewardStateChange) -- 显示掉落 + UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1) end) end,1,1,false):Start() @@ -397,9 +399,20 @@ function this.RequestGetDailyReward(func) PopupTipPanel.ShowTip(string.format(Language[10298],GetLanguageStrById(itemConfig[itemId].Name))) return end - ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeId,1,function() - PrivilegeManager.RefreshPrivilegeUsedTimes(buyPriId,1) - s() + -- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeId,1,function() + -- PrivilegeManager.RefreshPrivilegeUsedTimes(buyPriId,1) + -- s() + -- end) + NetManager.GetHardStageDailyReward(function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(buyPriId,1)--记录抽卡次数 + --PrivilegeManager.RefreshPrivilegeUsedTimes(buyPriId,1) + -- 刷新红点状态 + CheckRedPointStatus(RedPointType.FightLevelDailyReward) + -- 触发状态改变 + Game.GlobalEvent:DispatchEvent(GameEvent.FightLevel.DailyRewardStateChange) + -- 显示掉落 + + UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua index ecb9459a8c..da41cc47ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua @@ -98,9 +98,9 @@ function this:OnShow(_parent,_args) end if bagNum < list[i][2] then isCan=false - numTxt.text=string.format("%s/%s",bagNum,list[i][2]) + numTxt.text=string.format("%s/%s",PrintWanNum(bagNum),list[i][2]) else - numTxt.text=string.format("%s/%s",bagNum,list[i][2]) + numTxt.text=string.format("%s/%s",PrintWanNum(bagNum),list[i][2]) end Util.AddClick(btnObj,function() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemConfig[list[i][1]].Id,nil) diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua index d344be512d..9402891d47 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua @@ -47,7 +47,8 @@ function GodPrintPanel:InitComponent() this.showBtn:SetActive(false) this.backBtn = Util.GetGameObject(this.gameObject, "BackBtn/btnBack") this.empty=Util.GetGameObject(this.gameObject,"Empty") - + this.emptyTxt=Util.GetGameObject(this.gameObject,"Empty/talkImage/Text"):GetComponent("Text") + this.emptyTxt.text="无符合条件的神印!" --循环布局根节点 this.loopRoot=Util.GetGameObject(this.gameObject,"LoopRoot") this.loopPre=Util.GetGameObject(this.loopRoot,"Pre") diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua index e91bb56896..7b5ea6e46c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua @@ -23,6 +23,8 @@ function GodPrintPopUpV2:InitComponent() this.backBtn=Util.GetGameObject(this.panel,"BackBtn") this.title=Util.GetGameObject(this.panel,"Title"):GetComponent("Text") this.empty=Util.GetGameObject(this.panel,"Empty") + this.emptyTxt=Util.GetGameObject(this.panel,"Empty/talkImage/Text"):GetComponent("Text") + this.emptyTxt.text="未佩戴神印!" this.scrollRoot=Util.GetGameObject(this.gameObject,"ScrollRoot") this.pre=Util.GetGameObject(this.scrollRoot,"Pre") this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scrollRoot.transform,this.pre, nil,-- diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua index 33c38744cd..ee650bd1c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua @@ -28,6 +28,7 @@ local _PanelType = { [2] = PanelType.IronResource, [3] = PanelType.requiem, [4] = PanelType.StarSoul, + [5] = PanelType.GodPrint, } local list={} @@ -207,6 +208,7 @@ end --界面打开时调用(用于子类重写) function GodPrintResolvePanel:OnOpen(_tabType) tabType=_tabType + LogError("tabtype=="..tabType) isPlayanim = true isTop = true end @@ -245,6 +247,11 @@ function this.GetTabTypeShoePanel(_tabType) this.soulPrintScroll:SetActive(true) this.soulPrintObject:SetActive(true) this.SortTypeClick(tabSortType,soulPrintEndBtns[1]) + elseif _tabType==5 then + this.btnSoulPrintGrid:SetActive(true) + this.soulPrintScroll:SetActive(true) + this.soulPrintObject:SetActive(true) + this.SortTypeClick(tabSortType,soulPrintEndBtns[1]) end end --展示数据 @@ -260,7 +267,7 @@ function this.SortTypeClick(_sortType,_btn) this.EndTabBtnSelect(_btn) this.CleanSelectList() - if tabType == 4 then + if tabType == 5 then list={} soulPrintData= BagManager.GetAllGodPrintData(tabSortType) table.sort(soulPrintData,function(a,b) @@ -374,7 +381,7 @@ end --计算奖励 和 已选择数量 function this.UpdataPanelRewardAndSelectText() local allRewardData={} - if tabType == 4 then + if tabType == 5 then this.selectText.text = Language[11728]..LengthOfTable(chooseIdList).."/"..#soulPrintData for i, v in pairs(chooseIdList) do local rewardGroupId = tonumber(itemConfig[v].ResolveReward) @@ -429,7 +436,7 @@ end --快速选择英雄 或者 装备 function this.QuickSelectListData() - if tabType == 4 then + if tabType == 5 then chooseIdList={} local tempchooseIdList={} for k, v in pairs(soulPrintData) do @@ -476,7 +483,7 @@ function this.SendBackResolveReCallBack(drop) else BagManager.OnShowTipDropNumZero(drop) end - if tabType== 4 then + if tabType== 5 then --移除魂印 GodPrintManager.RemoveSoulPrint(chooseIdList) local soulPrint= GodPrintManager.GetSoulPrintQualityDataByType(this.soulPrintChooseType) @@ -494,7 +501,7 @@ function this.ResolveBtnClickEvent() local curResolveAllItemList={} local isSoulPrintShowSure=false local type=-1 - if tabType==4 then + if tabType==5 then isSoulPrintShowSure=false type=1 local temp = {} diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua index 417487bb20..8e5c7550cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua @@ -241,14 +241,13 @@ function HandBookHeroAndEquipListPanel:GetHeroData() for id, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do if (not v.Hide or v.Hide == 0) and HeroManager.InVersion(id) then - -- if v.Natural == 7 and (proId == 0 or v.PropertyName == proId) then - -- table.insert(tenHeroList,v) - -- else - if v.Natural == 6 and (proId == 0 or v.PropertyName == proId) then + if v.Natural == 7 and (proId == 0 or v.PropertyName == proId) then + table.insert(tenHeroList,v) + elseif v.Natural == 6 and (proId == 0 or v.PropertyName == proId) then table.insert(sexHeroList,v) - if v.MaxRank==14 then - table.insert(tenHeroList,v) - end + -- if v.MaxRank==14 then + -- table.insert(tenHeroList,v) + -- end elseif v.Natural == 5 and (proId == 0 or v.PropertyName == proId) then table.insert(fiveHeroList,v) elseif v.Natural == 4 and (proId == 0 or v.PropertyName == proId) then diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua index 9e1576c697..558e179095 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua @@ -44,11 +44,12 @@ function IncarnationForcePanel:BindEvent() local curHaveItemNum=BagManager.GetItemCountById(this.configData.ExpCost[1]) local curCostItemNum=this.configData.ExpCost[2] if curHaveItemNum =curCostItemNum then + return true + end + return false +end function this.GetChangeCardProperty(cardId,isNextLv,isNextStar) local changeCardInfo=this.itemDataList[cardId] @@ -348,6 +351,44 @@ function this.GetChangeCardProperty(cardId,isNextLv,isNextStar) return nil end +function this.GetChangeCardPropertyAdd(cardId,level,star) + local cardConfig=ConfigManager.GetConfigData(ConfigName.ChangingCard,cardId) + local propList={} + for k,v in pairs(cardConfig.PropList) do + propList[v[1]]=v[2] + end + if star>0 then + local startProp + if star==1 then + startProp=cardConfig.Star1UpProps + elseif star==2 then + startProp=cardConfig.Star2UpProps + elseif star==3 then + startProp=cardConfig.Star3UpProps + end + for k,v in pairs(startProp) do + if propList[v[1]] then + propList[v[1]]=propList[v[1]]+v[2] + else + propList[v[1]]=v[2] + end + + end + end + + if level>0 then + local cardLvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"Level",level,"PoolId",cardConfig.LevelUpPool) + for k,v in pairs(cardLvConfig.PropList) do + if propList[v[1]] then + propList[v[1]]=propList[v[1]]+v[2] + else + propList[v[1]]=v[2] + end + end + end + return propList +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index 52c05b1867..620b28fa6f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -18,6 +18,7 @@ function IncarnationPanel:InitComponent() self.selectBtn = Util.GetGameObject(self.gameObject,"bg/Tabs/selectBtn") self.btnBack = Util.GetGameObject(self.gameObject,"bg/btnBack") self.incarnationPowerBtn = Util.GetGameObject(self.gameObject,"bg/incarnationPowerBtn") + self.powerBtnRedPoint = Util.GetGameObject(self.gameObject,"bg/incarnationPowerBtn/redPoint") self.addBtn = Util.GetGameObject(self.gameObject,"bg/addBtn") self.helpBtn = Util.GetGameObject(self.gameObject,"bg/helpBtn") self.helpPos = self.helpBtn:GetComponent("RectTransform").localPosition @@ -108,6 +109,7 @@ function IncarnationPanel:BindEvent() BindRedPointObject(RedPointType.incarnation_buddish,tabsRedpoints[2].gameObject) BindRedPointObject(RedPointType.incarnation_demon,tabsRedpoints[3].gameObject) BindRedPointObject(RedPointType.incarnation_taoist,tabsRedpoints[4].gameObject) + BindRedPointObject(RedPointType.incarnation_force,self.powerBtnRedPoint.gameObject) end function IncarnationPanel:FindDatasIndexById(id) @@ -197,7 +199,7 @@ function IncarnationPanel:RefreshSingleCardPre(cardPre,data,isJump,index) self.cardList[cardPre].cardBg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[data.quality]) if isJump then Util.AddOnceClick(self.cardList[cardPre].getBtn,function() - UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, data.itemId, function()end) + UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, data.itemId) end) end for i = 0, 3 do @@ -318,18 +320,22 @@ function IncarnationPanel:SetSingleData(go,data,index) end end) - Util.AddOnceClick(self.itemPreList[go].activableBtn,function() - if data.state == 0 then - NetManager.UpOrDownTransformationRequest(data.id,0,1,function() + Util.AddOnceClick(self.itemPreList[go].incarnationningBtn,function() + if data.state == 2 then + NetManager.UpOrDownTransformationRequest(data.id,data.pos,1,function() + local oldPos = data.pos data.state = 1 + data.pos = 0 self:SetSingleData(go,data,index) - PopupTipPanel.ShowTip(string.format("成功激活%s",data.name)) - CheckRedPointStatus(data.property + 438001) - end) - else - PopupTipPanel.ShowTip(string.format("成功激活%s",data.name)) - end - end) + self.upLayoutData[oldPos] = nil + self:RefreshSingleCardPre(self.upLayoutItemList[oldPos].pos,nil,false,oldPos) + self.upLayoutItemList[oldPos].btn.gameObject:SetActive(false) + PopupTipPanel.ShowTip("成功卸下身外化身!") + end) + end + end) + + Util.AddOnceClick(self.itemPreList[go].upLvBtn,function() UIManager.OpenPanel(UIName.IncarnationUpPopup,1,data.id) @@ -390,6 +396,7 @@ function IncarnationPanel:OnDestroy() ClearRedPointObject(RedPointType.incarnation_buddish,tabsRedpoints[2].gameObject) ClearRedPointObject(RedPointType.incarnation_demon,tabsRedpoints[3].gameObject) ClearRedPointObject(RedPointType.incarnation_taoist,tabsRedpoints[4].gameObject) + ClearRedPointObject(RedPointType.incarnation_force,self.powerBtnRedPoint.gameObject) SubUIManager.Close(self.UpView) end diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpHelpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpHelpPopup.lua index 161544dc2c..1eff6a9b84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpHelpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpHelpPopup.lua @@ -4,14 +4,11 @@ local this=IncarnationUpHelpPopup local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) function this:InitComponent() - this.spLoader = SpriteLoader.New() this.btnBack = Util.GetGameObject(self.gameObject, "BackMask") - this.pro = Util.GetGameObject(self.gameObject, "pro") - this.proContent = Util.GetGameObject(self.pro, "content") - this.proGrid= Util.GetGameObject(self.gameObject, "scroll/proScroll/proScrollgrid2") - this.proGridPos = self.proGrid:GetComponent("RectTransform").anchoredPosition - this.proList = {} this.back = Util.GetGameObject(self.gameObject, "BG/BackBtn") + this.maxLevel=Util.GetGameObject(self.gameObject, "maxLevel"):GetComponent("Text") + this.propGrid=Util.GetGameObject(self.gameObject, "propLayout/grid") + this.skillDes=Util.GetGameObject(self.gameObject, "skillDes"):GetComponent("Text") end function this:BindEvent() @@ -40,31 +37,30 @@ end function this:OnOpen(_cardId) local cardData= IncarnationManager.itemDataList[_cardId] local cardConfig=ConfigManager.GetConfigData(ConfigName.ChangingCard,_cardId) - local levelConfigs=ConfigManager.GetAllConfigsDataByKey(ConfigName.ChangingCardLevel,"PoolId",cardConfig.LevelUpPool) - local isNew=this.proGrid.transform.childCount<=0 + local maxStarProp=cardConfig.Star3UpProps + local levelConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"PoolId",cardConfig.LevelUpPool,"Level",cardConfig.LevelMax) + local maxLevelProp=levelConfig.PropList + this.maxLevel.text=cardConfig.LevelMax.."级" + this.skillDes.text="技能:"..IncarnationManager.GetSkillDesStr(_cardId,3) + local propList={} + for k,v in pairs(maxStarProp) do + if propList[v[1]] then + propList[v[1]]=propList[v[1]]+v[2] + else + propList[v[1]]=v[2] + end + end + for k,v in pairs(maxLevelProp) do + if propList[v[1]] then + propList[v[1]]=propList[v[1]]+v[2] + else + propList[v[1]]=v[2] + end + end local index=0 - for i = 1, #levelConfigs do - local go - if isNew then - go= newObjToParent(this.pro,this.proGrid) - else - go= this.proGrid.transform:GetChild(index) - end - - - local str="" - for j = 1, #levelConfigs[i].PropList do - local propId= levelConfigs[i].PropList[j][1] - local propVal= levelConfigs[i].PropList[j][2] - str = str..PropertyConfig[propId].Info.."+"..GetPropertyFormatStrOne(PropertyConfig[propId].Style,propVal).." " - end - if cardData.level==levelConfigs[i].Level then - Util.GetGameObject(go, "title"):GetComponent("Text").text=string.format("%s级",levelConfigs[i].Level) - Util.GetGameObject(go, "content"):GetComponent("Text").text=string.format("%s",str) - else - Util.GetGameObject(go, "title"):GetComponent("Text").text=string.format("%s级",levelConfigs[i].Level) - Util.GetGameObject(go, "content"):GetComponent("Text").text=string.format("%s",str) - end + for k,v in pairs(propList) do + local propText=this.propGrid.transform:GetChild(index):GetComponent("Text") + propText.text = PropertyConfig[k].Info.."+"..GetPropertyFormatStrOne(PropertyConfig[k].Style,v) index=index+1 end end @@ -81,7 +77,6 @@ end --界面销毁时调用(用于子类重写) function this:OnDestroy() - self.spLoader:Destroy() - self.proList = {} + end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua index 93642c0e56..1505ed4d87 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua @@ -15,7 +15,8 @@ function this:InitComponent() this.titleText = Util.GetGameObject(self.gameObject, "root/bg/titleText"):GetComponent("Text") this.prefab=Util.GetGameObject(self.gameObject, "root/prefab") - this.itemView= SubUIManager.Open(SubUIConfig.ItemView, this.prefab.transform) + + this.lvLayout=Util.GetGameObject(self.gameObject, "root/verLayout/lvLayout") this.curLvText=Util.GetGameObject(this.lvLayout, "grid/curLv"):GetComponent("Text") @@ -25,6 +26,10 @@ function this:InitComponent() this.curProp=Util.GetGameObject(this.proyLayout, "grid/curProp") this.nextProp=Util.GetGameObject(this.proyLayout, "grid/nextProp") + this.forceLayout=Util.GetGameObject(self.gameObject, "root/verLayout/forceLayout") + this.curDrop=Util.GetGameObject(this.forceLayout, "grid/curDrop"):GetComponent("Text") + this.nextDrop=Util.GetGameObject(this.forceLayout, "grid/nextDrop"):GetComponent("Text") + this.skillLayout=Util.GetGameObject(self.gameObject, "root/verLayout/skillLayout") this.curSkillDes=Util.GetGameObject(this.skillLayout, "grid/curSkillDes/text"):GetComponent("Text") this.nextSkillDes=Util.GetGameObject(this.skillLayout, "grid/nextSkillDes/text"):GetComponent("Text") @@ -42,6 +47,7 @@ function this:InitComponent() this.upLvBtn = Util.GetGameObject(this.costLayout, "upLvBtn") this.upStarBtn = Util.GetGameObject(this.costLayout, "upStarBtn") + this.itemView= SubUIManager.Open(SubUIConfig.ItemView, this.prefab.transform) end function this:BindEvent() @@ -70,7 +76,11 @@ function this:BindEvent() PopupTipPanel.ShowTip("星级已满") return end - if #curSelectMat0 and this.cardConfig.StarUpExp[curStar][2] or 0 this.upLvBtn.gameObject:SetActive(false) this.upStarBtn.gameObject:SetActive(true) this.skillLayout.gameObject:SetActive(true) @@ -151,14 +165,18 @@ function this.UpdateWin() this.nextProp.gameObject:SetActive(false) this.costGrid.gameObject:SetActive(false) this.nextSkillDes.transform.parent.gameObject:SetActive(false) + this.nextDrop.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) + this.nextDrop.gameObject:SetActive(true) local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,false,true) + this.nextLvText.text=curStar+1 this.SetPropInfo(this.nextProp,nextPropData) this.SetCostItem(this.cardConfig.StarUpCost[curStar+1]) + this.nextDrop.text="+"..this.cardConfig.StarUpExp[curStar+1][2] end end @@ -199,8 +217,7 @@ function this.SetCostItem(costData) this.num.text= string.format("%s","0/"..costData[2]) this.bianImg.gameObject:SetActive(true) end - - Util.AddClick(Util.GetGameObject(this.costItem, "frame"), function() + Util.AddOnceClick(Util.GetGameObject(this.costItem, "frame"), function() this.itemView:OnBtnCkickEvent(costData[1]) end) end @@ -233,15 +250,13 @@ function this.CheckLevelLimit() return false end -function this:OnSortingOrderChange() -end - function this:OnClose() Game.GlobalEvent:DispatchEvent(GameEvent.CommonEvent.RefreshIncarnationPanel) end function this:OnDestroy() - + self.spLoader:Destroy() + curSelectMat={} end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpStarListPanel.lua index ccc1568fad..f55479cbf4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpStarListPanel.lua @@ -77,7 +77,7 @@ function this:OnOpen(_openThisPanel,_curSelectHeroList,_needInfo) heroDataList={} local allItemList= BagManager.GetBagAllDataByItemType(29) for i, v in pairs(allItemList) do - if v.quality==needQuality then + if v.quality==needQuality and v.num>0 then table.insert(heroDataList,v) end end @@ -114,7 +114,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 icon.sprite = this.spLoader:LoadSprite(heroData.icon) num.text = heroData.num proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.itemConfig.val[9]))--9是阵营id - name.text = heroData.name + name.text =string.gsub(heroData.name, "变身", "") Util.AddOnceClick(cardBtn, function() local isSelect = false local selectIndex = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index cc9c2679a8..b7a5bf87e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6267,6 +6267,7 @@ function NetManager.SendTransformationUpGradeRequest(type,id,costList,func) IncarnationManager.SetSkillData(info.id) PopupTipPanel.ShowTip("升星成功") end + CheckRedPointStatus(RedPointType.incarnation_force) IncarnationManager.SetPropDatas(info.id) NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) local newPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 601b0dedda..a4777b556a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -137,6 +137,8 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Shop_Tab_Arena, RedPointType.Shop_Page_Play) RPData:SetParent(RedPointType.Shop_Tab_Guild, RedPointType.Shop_Page_Play) RPData:SetParent(RedPointType.Shop_Tab_Roam, RedPointType.Shop_Page_Roam) + RPData:SetParent(RedPointType.Shop_Tab_God, RedPointType.Shop_Page_Play) + RPData:SetParent(RedPointType.Shop_God_Refresh, RedPointType.Shop_Tab_God) -- ====== 商店功能 RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General) RPData:SetParent(RedPointType.Shop_General_Refresh, RedPointType.Shop_Tab_General) @@ -339,6 +341,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.incarnation_buddish,RedPointType.incarnation) RPData:SetParent(RedPointType.incarnation_demon,RedPointType.incarnation) RPData:SetParent(RedPointType.incarnation_taoist,RedPointType.incarnation) + RPData:SetParent(RedPointType.incarnation_force,RedPointType.incarnation) RPData:SetParent(RedPointType.incarnation,RedPointType.Practice) --命格 @@ -391,6 +394,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_General_Refresh, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Soul_Refresh, ShopManager.ShopRedCheck) + RPData:AddCheckFunc(RedPointType.Shop_God_Refresh, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck) @@ -651,6 +655,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.incarnation_buddish,IncarnationManager.CheckRedData) RPData:AddCheckFunc(RedPointType.incarnation_demon,IncarnationManager.CheckRedData) RPData:AddCheckFunc(RedPointType.incarnation_taoist,IncarnationManager.CheckRedData) + RPData:AddCheckFunc(RedPointType.incarnation_force,IncarnationManager.CheckPowerBtnRedData) RPData:AddCheckFunc(RedPointType.tiandihonglu,OperatingManager.GetTianDiHongLuRedPointStatus) RPData:AddCheckFunc(RedPointType.recruitTreasure_one,RecruitTreasureManager.GetRedPointStatus) @@ -774,11 +779,6 @@ end --- 检测红点状态 function this.CheckRedPointStatus(rpType) - function _CheckRepeat(rpType) - - end - - if this.isDirty then if not table.indexof(this.refreshList, rpType) then table.insert(this.refreshList, rpType) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 6b6bddf95f..3bb9082659 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -588,9 +588,19 @@ function this.huashenInfoShow(teamInfo,Grid) local itemview = SubUIManager.Open(SubUIConfig.ItemView, item.transform) this.ItemList[i] = itemview + this.ItemList[i].transform:SetSiblingIndex(1) end - this.ItemList[i]:OnOpen(false, {ChangingCard[value.id].CardId,0}, 1,false,false,false,this.sortingOrder) + this.ItemList[i]:OnOpen(false, {ChangingCard[value.id].CardId,0,0,value.level,value.star}, 1,false,false,false,this.sortingOrder) Util.GetGameObject(item,"Name"):GetComponent("Text").text = ItemConfig[ChangingCard[value.id].CardId].Name + Util.GetGameObject(item,"lvbg/levelText"):GetComponent("Text").text = value.level + local starGrid= Util.GetGameObject(item,"starGrid") + for i = 0, 3 do + if i 0 and PlayerManager.level < itemConfigData.UseLevel then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua index 6986b9ca39..6017e2041c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua @@ -4,13 +4,7 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig) local _BaseProList = {}--基础属性对象 -local _suitProList = {}--套装属性对象 -local _superProList = {}--白金属性对象 -local typeToUpdate = { - [2] = 2,--已穿戴->卸载单件 - [3] = 1,--未穿戴->穿单件 - [4] = 3,--未穿戴->替换单件 -} + --初始化组件(用于子类重写) function RewardTailsmanChipShowPopup:InitComponent() self.spLoader = SpriteLoader.New() @@ -33,12 +27,10 @@ function RewardTailsmanChipShowPopup:InitComponent() self.baseProGrid = Util.GetGameObject(self.basePro, "grid") self.baseProPre = Util.GetGameObject(self.basePro, "grid/curProName") self.baseProPre:SetActive(false) - --superPro self.superPro = Util.GetGameObject(self.midBar, "superPro") self.superProGrid = Util.GetGameObject(self.superPro, "proGrid") self.superProPre = Util.GetGameObject(self.superPro, "proGrid/Desc") - self.superProPre:SetActive(false) --装备获取途径--btmBar self.btmBar = Util.GetGameObject(self.transform, "Content/btmBar/howGet") @@ -71,38 +63,45 @@ function RewardTailsmanChipShowPopup:RemoveListener() end --界面打开时调用(用于子类重写) -function RewardTailsmanChipShowPopup:OnOpen(_equipData,_func) - if not _equipData then - return +function RewardTailsmanChipShowPopup:OnOpen(_cardId,_cardLv,_cardStar) + self.cardItemId = _cardId --化身卡道具id + self.level=0 + self.star=0 + if _cardLv then + self.level = _cardLv --化身卡等级 end - self.equipData = _equipData --当前装备数据 - self.func = _func + if _cardStar then + self.star = _cardStar --化身卡星级 + end + end function RewardTailsmanChipShowPopup:OnShow() - local itemConfigData = IncarnationManager.GetIncarnationDataById(self.equipData) - local equipConfigData = ConfigManager.GetConfigData(ConfigName.ItemConfig,self.equipData) - self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..equipConfigData.Quantity) + local itemData = itemConfig[tonumber(self.cardItemId)] + local cardId=ConfigManager.GetConfigDataByKey(ConfigName.ChangingCard,"CardId",self.cardItemId).Id + local proDatas = IncarnationManager.GetChangeCardPropertyAdd(cardId,self.level,self.star) + + self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemData.Quantity) - self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quantity,GetQuaStringByEquipQua(equipConfigData.Quantity)) - self.eqiopName.text=GetStringByEquipQua(equipConfigData.Quantity,GetLanguageStrById(equipConfigData.Name)) - self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(equipConfigData.Quantity)) - self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(equipConfigData.ResourceID)) - self.equipInfoText.text = GetLanguageStrById(equipConfigData.ItemDescribe) + self.equipQuaText.text=GetStringByEquipQua(itemData.Quantity,GetQuaStringByEquipQua(itemData.Quantity)) + self.eqiopName.text=GetStringByEquipQua(itemData.Quantity,GetLanguageStrById(itemData.Name)) + self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemData.Quantity)) + self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemData.ResourceID)) + self.equipInfoText.text = GetLanguageStrById(itemData.ItemDescribe) self.equipType.text = "" --下部按钮信息 - self.effectbaijin:SetActive(equipConfigData.Quantity==7) + self.effectbaijin:SetActive(itemData.Quantity==7) Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1) --basePro基础属性 - if itemConfigData.proDatas then + if proDatas then self.basePro:SetActive(true) for _, pro in ipairs(_BaseProList) do pro:SetActive(false) end - for index, prop in ipairs(itemConfigData.proDatas) do - local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, index) + for index, prop in ipairs(proDatas) do + local proConfigData = propertyConfig[index] if proConfigData then if not _BaseProList[index] then _BaseProList[index] = newObjToParent(self.baseProPre, self.baseProGrid) @@ -120,11 +119,7 @@ function RewardTailsmanChipShowPopup:OnShow() else self.basePro:SetActive(false) end - if not _superProList[1] then - _superProList[1] = newObjToParent(self.superProPre, self.superProGrid) - end - _superProList[1].gameObject:SetActive(true) - _superProList[1]:GetComponent("Text").text = itemConfigData.skillDes + self.superProPre:GetComponent("Text").text = IncarnationManager.GetSkillDesStr(cardId,self.star) --获取途径 if self.jumpViewList and #self.jumpViewList > 0 then @@ -132,15 +127,15 @@ function RewardTailsmanChipShowPopup:OnShow() SubUIManager.Close(self.jumpViewList[i]) end end - local curitemData = itemConfig[tonumber(self.equipData)] - if curitemData and curitemData.Jump then - if curitemData.Jump and #curitemData.Jump>0 then - self.canGetScrollView:SetData(curitemData.Jump,function (index, item) + + if itemData and itemData.Jump then + if itemData.Jump and #itemData.Jump>0 then + self.canGetScrollView:SetData(itemData.Jump,function (index, item) local tempView = nil if self.isShowGo then - tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],true) + tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, itemData.Jump[index],true) else - tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false) + tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, itemData.Jump[index],false) end table.insert(self.jumpViewList,tempView) end,true,true) @@ -152,10 +147,6 @@ function RewardTailsmanChipShowPopup:OnShow() ForceRebuildLayout(self.midBar.transform) ForceRebuildLayout(self.midBar.transform) ForceRebuildLayout(self.midBar.transform) - - if self.func then - self.func() - end end --界面关闭时调用(用于子类重写) @@ -169,8 +160,6 @@ end function RewardTailsmanChipShowPopup:OnDestroy() self.spLoader:Destroy() _BaseProList = {} - _suitProList = {} - _superProList = {} self.jumpViewList = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/ChangeHeroProConfirmWindow.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/ChangeHeroProConfirmWindow.lua index 5a50ab40bd..1d89fb860e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/ChangeHeroProConfirmWindow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/ChangeHeroProConfirmWindow.lua @@ -6,7 +6,7 @@ local costConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,147) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local func function ChangeHeroProConfirmWindow:InitComponent() - LogError("1111111111111") + -- LogError("1111111111111") local gameObject=self.gameObject this.bgBtn=gameObject this.titleText=Util.GetGameObject(gameObject,"content/TitleText"):GetComponent("Text") diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index d7f1cf18c1..641a090e16 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -72,12 +72,15 @@ function this.TabAdapter(tab, index, status) -- 刷新红点显示 _TabRedpot[index] = Util.GetGameObject(tab, "Redpot") this.RefreshTabRedpot(index) + if status=="lock" then + tab:SetActive(false) + end end -- tab可用性检测 function this.PageTabIsLockCheck(index) if index == 2 then -- 开服前七天, 未跨服都不打开跨服排行榜 - if GetTimeStamp() - PlayerManager.GetServerOpenTime() < 7*24*60*60 or PlayerManager.isCross == 0 then + if not CheckFunctionOpen(FUNCTION_OPEN_TYPE.CROSS_RANK) or PlayerManager.isCross == 0 then return true, "未划分跨服分组!" end else diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 54d62d64a3..cde8ef7367 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -41,6 +41,7 @@ function RecruitPanelNew:InitComponent() self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition self.wish = Util.GetGameObject(self.panel,"wishBtn") + self.wish:SetActive(false) self.wishNoOpen = Util.GetGameObject(self.wish,"noOpen") self.wishBtn = Util.GetGameObject(self.wishNoOpen,"Img") self.wishTextImg = Util.GetGameObject(self.wishNoOpen,"ImgText") @@ -181,7 +182,8 @@ function RecruitPanelNew:UpdataWishPanel() self.tenTip.gameObject:SetActive(false) return end - self.wish.gameObject:SetActive(true) + --屏蔽心愿 + self.wish.gameObject:SetActive(false) --如果没有达到150抽按钮置灰 local data = tonumber(specialConfig[119].Value) NetManager.ChoiceWishHeroRequest(nil,function () diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 5498a2d52e..0a28810740 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -433,7 +433,7 @@ function this.GetSkillsData() OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules) if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) - LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum) + -- LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum) heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum heroSkill.state = 1 if curHeroData.star == 12 then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 9c8f07c033..9c3021f1bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -234,6 +234,7 @@ function RoleInfoPanel:BindEvent() Util.AddClick(this.godPrintBtn,function () if not isOpenGod then PopupTipPanel.ShowTip("神将六星解锁神印") + return end UIManager.OpenPanel(UIName.GodPrintPanel,curHeroData,heroDatas) end) @@ -672,7 +673,7 @@ function this:UpdateHeroInfoData() for k,v in pairs(this.PageList) do v:OnHide() end - LogError("_CurPageIndex==".._CurPageIndex) + -- LogError("_CurPageIndex==".._CurPageIndex) if _CurPageIndex == RoleInfoPanelIndex.pifu then local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id) local HeoSkin = {} @@ -766,7 +767,7 @@ function this:UpdateHeroInfoData() if config then local limits = string.split(config.Value, "#") if limits then - this.godPrintBtn:SetActive(ActTimeCtrlManager.IsQualifiled(126)) + this.godPrintBtn:SetActive(ActTimeCtrlManager.IsQualifiled(126)and curHeroData.heroConfig.MaxRank >= 6) isOpenGod=curHeroData.star >= tonumber(limits[1]) Util.SetGray(this.godPrintBtn, not isOpenGod) Util.GetGameObject(this.godPrintBtn, "lock"):SetActive(not isOpenGod) diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index cac18b3466..598be65d07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -362,6 +362,8 @@ function this.GetTabRPType(shopType) rpType = RedPointType.Shop_Tab_Roam elseif shopType == SHOP_TYPE.GUILD_SHOP then rpType = RedPointType.Shop_Tab_Guild + elseif shopType == SHOP_TYPE.GodPrint then + rpType = RedPointType.Shop_Tab_God end return rpType end diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index ddf7c85444..d3f475afd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -1110,6 +1110,8 @@ function this.ShopRedCheck(redType) return this.ShopRefreshRPIsShow(SHOP_TYPE.GENERAL_SHOP) elseif redType == RedPointType.Shop_Soul_Refresh then return this.ShopRefreshRPIsShow(SHOP_TYPE.SOUL_PRINT_SHOP) + elseif redType == RedPointType.Shop_God_Refresh then + return this.ShopRefreshRPIsShow(SHOP_TYPE.GodPrint) end end @@ -1130,6 +1132,8 @@ function this.CheckShopRedpot(shopType) CheckRedPointStatus(RedPointType.Shop_General_Refresh) elseif shopType == SHOP_TYPE.SOUL_PRINT_SHOP then CheckRedPointStatus(RedPointType.Shop_Soul_Refresh) + elseif shopType == SHOP_TYPE.GodPrint then + CheckRedPointStatus(RedPointType.Shop_God_Refresh) elseif shopType == SHOP_TYPE.BUYCOIN_SHOP then CheckRedPointStatus(RedPointType.UpView_Gold) end diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index bbc4523239..80824e4d17 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -413,8 +413,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.PokemonGetInfoPopup, true, _itemData.backData) end) - elseif _itemData.ItemType == ItemType.Incarnation then - --,5随机道具,6符文 + elseif _itemData.ItemType == ItemType.Incarnation then--化身卡 self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[ _itemData.backData.itemId].Quantity)) self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[ _itemData.backData.itemId].ResourceID)) Util.AddOnceClick(self.frameBtn, function() @@ -795,12 +794,11 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true) end) - elseif itemDataConFig.ItemType == ItemType.Incarnation then - --,5随机道具,6符文 + elseif itemDataConFig.ItemType == ItemType.Incarnation then--化身卡 self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) Util.AddOnceClick(self.frameBtn, function() - UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, itemSId, nil) + UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, itemSId,_reward[4],_reward[5]) end) elseif itemDataConFig.ItemType == ItemType.Ride then--坐骑 self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) diff --git a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua index bf24fe474c..49c1736f7c 100644 --- a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua @@ -62,10 +62,12 @@ function JumpViewNew:OnOpen(jumpId,heroConfig,parent) self.desc.text = "完成至尊降世可直接获得玉皇大帝" elseif self.jumpSData.Type == JumpType.Lottery then self.costIconPos.gameObject:SetActive(false) - self.desc.text = "设为心愿神将会有更高概率" + --self.desc.text = "设为心愿神将会有更高概率" + self.desc.text = "使用点将神符抽取神将" elseif self.jumpSData.Type == JumpType.Lottery then self.costIconPos.gameObject:SetActive(false) - self.desc.text = "设为心愿神将会有更高概率" + --self.desc.text = "设为心愿神将会有更高概率" + self.desc.text = "使用点将神符抽取神将" elseif self.jumpSData.Type == JumpType.ElementDrawCard then self.info.text = GetLanguageStrById(self.jumpSData.Title) self.costIconPos.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index b02d13d088..6f3fda53df 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -182,9 +182,10 @@ function this:OnClose() -- 红点销毁 if self.ShopType == SHOP_TYPE.GENERAL_SHOP then ClearRedPointObject(RedPointType.Shop_General_Refresh) - end - if self.ShopType == SHOP_TYPE.SOUL_PRINT_SHOP then + elseif self.ShopType == SHOP_TYPE.SOUL_PRINT_SHOP then ClearRedPointObject(RedPointType.Shop_Soul_Refresh) + elseif self.ShopType == SHOP_TYPE.GodPrint then + ClearRedPointObject(RedPointType.Shop_God_Refresh) end if self.ScrollView then @@ -605,13 +606,13 @@ function this:ShopItemAdapter(shopItem, itemData) PopupTipPanel.ShowTip(Language[12039]) end) Util.AddOnceClick(bg, function() - if con.ItemType == ItemType.Incarnation then - local num = BagManager.GetItemCountById(con.Id) - if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then - PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") - return - end - end + -- if con.ItemType == ItemType.Incarnation then + -- local num = BagManager.GetItemCountById(con.Id) + -- if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then + -- PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") + -- return + -- end + -- end -- 售空 if isEmpty then PopupTipPanel.ShowTip(Language[12039]) @@ -676,16 +677,18 @@ function this:ShowShop(shopType,_sortingOrder) self.refreshRedpot:SetActive(false) if self.ShopType == SHOP_TYPE.GENERAL_SHOP then ClearRedPointObject(RedPointType.Shop_General_Refresh) - end - if self.ShopType == SHOP_TYPE.SOUL_PRINT_SHOP then + elseif self.ShopType == SHOP_TYPE.SOUL_PRINT_SHOP then ClearRedPointObject(RedPointType.Shop_Soul_Refresh) + elseif self.ShopType == SHOP_TYPE.GodPrint then + ClearRedPointObject(RedPointType.Shop_God_Refresh) end -- 绑定新红点 if shopType == SHOP_TYPE.GENERAL_SHOP then BindRedPointObject(RedPointType.Shop_General_Refresh, self.refreshRedpot) - end - if shopType == SHOP_TYPE.SOUL_PRINT_SHOP then + elseif shopType == SHOP_TYPE.SOUL_PRINT_SHOP then BindRedPointObject(RedPointType.Shop_Soul_Refresh, self.refreshRedpot) + elseif shopType == SHOP_TYPE.GodPrint then + BindRedPointObject(RedPointType.Shop_God_Refresh, self.refreshRedpot) end -- 刷新显示 diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 4e68257f99..4136fd4541 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -589,13 +589,13 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData) PopupTipPanel.ShowTip("商品已售空") end) Util.AddOnceClick(bg, function() - if con.ItemType == ItemType.Incarnation then - local num = BagManager.GetItemCountById(con.Id) - if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then - PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") - return - end - end + -- if con.ItemType == ItemType.Incarnation then + -- local num = BagManager.GetItemCountById(con.Id) + -- if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then + -- PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") + -- return + -- end + -- end -- 售空 if isEmpty then PopupTipPanel.ShowTip("商品已售空") diff --git a/Assets/ManagedResources/~Lua/misc/functions.lua b/Assets/ManagedResources/~Lua/misc/functions_lua.lua similarity index 100% rename from Assets/ManagedResources/~Lua/misc/functions.lua rename to Assets/ManagedResources/~Lua/misc/functions_lua.lua diff --git a/Assets/ManagedResources/~Lua/misc/functions.lua.meta b/Assets/ManagedResources/~Lua/misc/functions_lua.lua.meta similarity index 59% rename from Assets/ManagedResources/~Lua/misc/functions.lua.meta rename to Assets/ManagedResources/~Lua/misc/functions_lua.lua.meta index 99a4c81937..900d911cd1 100644 --- a/Assets/ManagedResources/~Lua/misc/functions.lua.meta +++ b/Assets/ManagedResources/~Lua/misc/functions_lua.lua.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 7ad071edc48d0d8469028957a2df9c67 -timeCreated: 1525414862 -licenseType: Pro +guid: 0d4e522e6543f8646b28a4410bb9a3ce DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/~Lua/tolua.lua b/Assets/ManagedResources/~Lua/tolua.lua index e75120cd88..c623d3af40 100644 --- a/Assets/ManagedResources/~Lua/tolua.lua +++ b/Assets/ManagedResources/~Lua/tolua.lua @@ -16,7 +16,7 @@ if DebugServerIp then require("mobdebug").start(DebugServerIp) end -require "misc.functions" +require "misc.functions_lua" Mathf = require "UnityEngine.Mathf" Vector3 = require "UnityEngine.Vector3" Quaternion = require "UnityEngine.Quaternion"