diff --git a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab index 16da0205cb..9cd28e5465 100644 --- a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &227743914114821486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1441245498250559665} + - component: {fileID: 5649482003827015692} + - component: {fileID: 6137733623063662762} + m_Layer: 5 + m_Name: rank2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1441245498250559665 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227743914114821486} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5619546233300333146} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -340, y: 0.000061035156} + m_SizeDelta: {x: 152, y: 152} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5649482003827015692 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227743914114821486} + m_CullTransparentMesh: 0 +--- !u!114 &6137733623063662762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227743914114821486} + 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: 3c01a305eb51c04478b39d3060aceefe, 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 &482684183697153720 GameObject: m_ObjectHideFlags: 0 @@ -104,6 +178,85 @@ MonoBehaviour: m_EditorClassIdentifier: bgList: - {fileID: 3892089496709810548} +--- !u!1 &509383581301386546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8336963311421306270} + - component: {fileID: 6930298257145526145} + - component: {fileID: 667263500156292077} + m_Layer: 5 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8336963311421306270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509383581301386546} + 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: 3060736757162950048} + 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: 187.3, y: 87.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6930298257145526145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509383581301386546} + m_CullTransparentMesh: 0 +--- !u!114 &667263500156292077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509383581301386546} + 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.9882353, g: 0.92156863, 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: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 58 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 4-10 --- !u!1 &858299788320127266 GameObject: m_ObjectHideFlags: 0 @@ -129,17 +282,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 858299788320127266} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 405232597685944583} + m_Father: {fileID: 5619546233300333146} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 900, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8876710764092857093 CanvasRenderer: @@ -389,12 +542,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1878332031418088278} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 405232597685944583} - m_RootOrder: 2 + m_Father: {fileID: 5619546233300333146} + 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} @@ -420,8 +573,8 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 5 m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 --- !u!1 &1985094837356846046 @@ -989,81 +1142,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5080312251218181767 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8332113507681662507} - - component: {fileID: 4391217402254468457} - - component: {fileID: 5715709281602132129} - m_Layer: 5 - m_Name: rank - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8332113507681662507 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5080312251218181767} - 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: 4878818197865136204} - m_Father: {fileID: 405232597685944583} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 108.1, y: -2.1} - m_SizeDelta: {x: 104, y: 108} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4391217402254468457 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5080312251218181767} - m_CullTransparentMesh: 0 ---- !u!114 &5715709281602132129 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5080312251218181767} - 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: c3dd9610bb7d50b47bc158a0e12c6839, 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 &5091389988436336956 GameObject: m_ObjectHideFlags: 0 @@ -1073,6 +1151,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 405232597685944583} + - component: {fileID: 1642694597608436624} m_Layer: 5 m_Name: itemPre m_TagString: Untagged @@ -1091,9 +1170,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1408903645927335063} - - {fileID: 8332113507681662507} - - {fileID: 3637171683400772941} + - {fileID: 5619546233300333146} m_Father: {fileID: 2763190075109123432} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1102,6 +1179,35 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -86} m_SizeDelta: {x: 1000, y: 172} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1642694597608436624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5091389988436336956} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 230, y: -20, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 0 + duration: 0.15 + delay: 0 + curveType: 11 + changeType: 0 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 5619546233300333146} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &5212723190387840636 GameObject: m_ObjectHideFlags: 0 @@ -1319,86 +1425,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &5491840918307872704 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4878818197865136204} - - component: {fileID: 4375941781007377301} - - component: {fileID: 2141639109892843127} - m_Layer: 0 - m_Name: num - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4878818197865136204 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5491840918307872704} - 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: 8332113507681662507} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4375941781007377301 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5491840918307872704} - m_CullTransparentMesh: 0 ---- !u!114 &2141639109892843127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5491840918307872704} - 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: 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 4 - LanguageIndex: 0 --- !u!1 &5806908432142361533 GameObject: m_ObjectHideFlags: 0 @@ -2058,6 +2084,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6392\u540D" LanguageIndex: 0 +--- !u!1 &7523994844745126034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3060736757162950048} + - component: {fileID: 373819585501442330} + - component: {fileID: 6208075437687665761} + m_Layer: 5 + m_Name: rank + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3060736757162950048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7523994844745126034} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8336963311421306270} + m_Father: {fileID: 5619546233300333146} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -340, y: 0.000061035156} + m_SizeDelta: {x: 220, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &373819585501442330 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7523994844745126034} + m_CullTransparentMesh: 0 +--- !u!114 &6208075437687665761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7523994844745126034} + 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: 3c01a305eb51c04478b39d3060aceefe, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7865473427769795962 GameObject: m_ObjectHideFlags: 0 @@ -2214,6 +2315,45 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5956\u52B1\u9053\u5177" LanguageIndex: 0 +--- !u!1 &8397359907404652214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5619546233300333146} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5619546233300333146 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8397359907404652214} + 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: 1408903645927335063} + - {fileID: 3060736757162950048} + - {fileID: 1441245498250559665} + - {fileID: 3637171683400772941} + m_Father: {fileID: 405232597685944583} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8649910609009169897 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0f828cef59..ff363d0020 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1433,6 +1433,7 @@ HELP_TYPE = { GuildTranscripe=67,--公会副本 QingLongSerectTreasure=68,--青龙秘宝 Expert_Expedition=70,--天宫达人 + DemonSlayer=71,--三界除魔 } NumToComplexFont = { diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua index 2d07e917c0..7a236fafd6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua @@ -1,12 +1,39 @@ require("Base/BasePanel") -DemonSlayerPanel = Inherit(BasePanel) +local DemonSlayerPanel = Inherit(BasePanel) local this = DemonSlayerPanel +local sortingOrder = 0 +local allData={} +local actRankConfig = ConfigManager.GetConfig(ConfigName.ActivityRankingReward) +local itemsGrid = {}--item重复利用 +local state = 0 +local allRankData={} +local myRankData={} + +local rankImage={ + [1] = "r_playerrumble_paiming_01", + [2] = "r_playerrumble_paiming_02", + [3] = "r_playerrumble_paiming_03", +} --初始化组件(用于子类重写) function DemonSlayerPanel:InitComponent() this.btnBack = Util.GetGameObject(self.gameObject,"BackBtn") this.helpBtn = Util.GetGameObject(self.gameObject,"HelpBtn") + this.time = Util.GetGameObject(self.gameObject, "rewardContent/time") + this.leftTime = Util.GetGameObject(self.gameObject, "rewardContent/time/num"):GetComponent("Text") + this.myRank = Util.GetGameObject(self.gameObject, "rewardContent/myRank/num"):GetComponent("Text") + this.pos = Util.GetGameObject(self.gameObject, "pos") + + this.itemPre = Util.GetGameObject(self.gameObject, "rewardContent/reward/itemPre") + this.scrollItem = Util.GetGameObject(self.gameObject, "rewardContent/reward/grid") + local rootHight = this.scrollItem.transform.rect.height + local width = this.scrollItem.transform.rect.width + this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform, + this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) + this.ScrollView.moveTween.MomentumAmount = 1 + this.ScrollView.moveTween.Strength = 2 + end --绑定事件(用于子类重写) @@ -16,7 +43,7 @@ function DemonSlayerPanel:BindEvent() end) Util.AddClick(this.helpBtn, function() local pos = this.helpBtn.transform.localPosition - UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Adventure, pos.x, pos.y) + UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.DemonSlayer, pos.x, pos.y) end) end @@ -35,14 +62,150 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function DemonSlayerPanel:OnShow() + DemonSlayerPanel:Refresh() end +function DemonSlayerPanel:Refresh() + local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DemonSlayer) + DemonSlayerPanel:SetState(ActInfo) + DemonSlayerPanel:SetRank() + DemonSlayerPanel:OnShowData(ActInfo) + DemonSlayerPanel:SetTime(ActInfo) + +end + +function DemonSlayerPanel:SetRank() + allRankData={} + myRankData={} + if state == 0 then + RankingManager.InitData(RANK_TYPE.MONSTER_RANK,function () + allRankData,myRankData = RankingManager.GetRankingInfo() + end) + elseif state == 1 then + -- body + end + +end + +function DemonSlayerPanel:SetState(ActInfo) + local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400 + + if ActInfo.endTime - GetTimeStamp() > 0 then + local time1 = ActInfo.endTime - GetTimeStamp() + if time1 - extraTime > 0 then + state = 0--7天内 + else + state = 1--2天内 + end + else + self:ClosePanel() + PopupTipPanel.ShowTip(Language[10029]) + end +end + +function DemonSlayerPanel:OnShowData(ActInfo) + allData={} + local prefab = {} + allData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRankingReward,"ActivityId",ActInfo.activityId) + if allData then + this.ScrollView:SetData(allData, function (index, go) + table.insert(prefab,go) + DemonSlayerPanel:SingleDataShow(go, allData[index],index) + end) + end + -- SecTorPlayAnim(prefab) +end + +function DemonSlayerPanel:SingleDataShow(pre,data,index) + local rank = Util.GetGameObject(pre,"rank") + local rank2 = Util.GetGameObject(pre,"rank2") + local num = Util.GetGameObject(pre,"rank/num") + local rewards = Util.GetGameObject(pre,"rewards") + local shows = data.RankingReward + + if index<4 then + rank2:GetComponent("Image").sprite = Util.LoadSprite(rankImage[index]) + num:SetActive(false) + rank:SetActive(false) + rank2:SetActive(true) + else + num:SetActive(true) + rank2:SetActive(false) + rank:SetActive(true) + num:GetComponent("Text").text = data.MinRank.."-"..data.MaxRank + end + + --滚动条复用重设itemview + if itemsGrid[pre] then + for i = 1, 5 do + itemsGrid[pre][i].gameObject:SetActive(false) + end + for i = 1, #shows do + if itemsGrid[pre][i] then + itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,sortingOrder) + itemsGrid[pre][i].gameObject:SetActive(true) + end + end + else + itemsGrid[pre]={} + for i = 1, 5 do + itemsGrid[pre][i] = SubUIManager.Open(SubUIConfig.ItemView, rewards.transform) + itemsGrid[pre][i].gameObject:SetActive(false) + end + for i = 1, #shows do + itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,sortingOrder) + itemsGrid[pre][i].gameObject:SetActive(true) + end + end + +end + +function DemonSlayerPanel:SetTime(ActInfo) + local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400 + --设置一进去的时间,不设置的话一进去会不对 + this.time:SetActive(state == 0) + local time = ActInfo.endTime - GetTimeStamp() - extraTime + if time > 86400 then + this.leftTime.text = TimeToDH(time) + else + this.leftTime.text = TimeToHMS(time) + end + --计时器 + Timer.New(function () + if state == 0 then + this.time:SetActive(true) + local time = ActInfo.endTime - GetTimeStamp() - extraTime + if time > 86400 then + this.leftTime.text = TimeToDH(time) + else + this.leftTime.text = TimeToHMS(time) + end + time = time -1 + if time <= 0 then + DemonSlayerPanel:Refresh() + end + elseif state == 1 then + -- body + this.time:SetActive(false) + local time = ActInfo.endTime - GetTimeStamp() + time = time -1 + if time <= 0 then + self:ClosePanel() + PopupTipPanel.ShowTip(Language[10029]) + end + end + end,1,-1,true):Start() +end + + --界面关闭时调用(用于子类重写) function DemonSlayerPanel:OnClose() + sortingOrder = 0 end --界面销毁时调用(用于子类重写) function DemonSlayerPanel:OnDestroy() + sortingOrder = 0 end return DemonSlayerPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 695d1d135a..a56693592f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1499,32 +1499,41 @@ function this.TimeFormat() end end - -- 三界除魔 - -- local function SetDemonSlayerActive(isActive) - -- if isActive ~= this.isDemonSlayerShow then - -- this.isDemonSlayerShow = isActive - -- this.btnDemonSlayer:SetActive(isActive) - -- end - -- end - -- local DemonSlayer = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DemonSlayer) - -- local DemonSlayerEndTime = nil - -- if not DemonSlayer then - -- LogGreen("三界除魔测试开启") - -- SetDemonSlayerActive(true) - -- -- SetDemonSlayerActive(false) - -- else - -- if DemonSlayerEndTime then - -- local tempTime = DemonSlayerEndTime - PlayerManager.serverTime - -- if tempTime and tempTime > 0 then - -- this.deathPosTime.text = "距闯阵结束\n"..TimeToHMS(tempTime) - -- SetDemonSlayerActive(true) - -- else - -- SetDemonSlayerActive(false) - -- end - -- else - -- SetDemonSlayerActive(false) - -- end - -- end + --三界除魔 + local function SetDemonSlayerActive(isActive) + if isActive ~= this.isDemonSlayerShow then + this.isDemonSlayerShow = isActive + this.btnDemonSlayer:SetActive(isActive) + end + end + local DemonSlayer = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DemonSlayer) + if not DemonSlayer then + SetDemonSlayerActive(false) + else + local DemonSlayerEndTime = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DemonSlayer).endTime + -- LogGreen(TimeToDHMS(DemonSlayerEndTime - GetTimeStamp())) + local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,DemonSlayer).GapTime*86400 + if DemonSlayerEndTime then + SetDemonSlayerActive(true) + if DemonSlayerEndTime - GetTimeStamp() > extraTime then + local time = DemonSlayerEndTime - GetTimeStamp()-extraTime + if time > 86400 then + this.DemonSlayerTime.text = TimeToDH(time) + else + this.DemonSlayerTime.text = TimeToHMS(time) + end + else + local time = DemonSlayerEndTime - GetTimeStamp() + if time > 86400 then + this.DemonSlayerTime.text = TimeToDH(time) + else + this.DemonSlayerTime.text = TimeToHMS(time) + end + end + else + SetDemonSlayerActive(false) + end + end end --为限时折扣写的 function this:GetInfoList()