diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index c7a42e431c..470dc8d083 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -4893,6 +4893,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1111025039415992935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5798039360851658602} + - component: {fileID: 526254988419342283} + - component: {fileID: 5198045097439843456} + m_Layer: 5 + m_Name: Go + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5798039360851658602 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111025039415992935} + 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: 7684111156226357852} + 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: -144, y: 3.8} + m_SizeDelta: {x: 105, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &526254988419342283 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111025039415992935} + m_CullTransparentMesh: 0 +--- !u!114 &5198045097439843456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111025039415992935} + 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: 4df0b51ed49908a4791aed4bd1447949, 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 &1188162311819864329 GameObject: m_ObjectHideFlags: 0 @@ -10449,6 +10523,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3272932953098839055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5368842645891760372} + - component: {fileID: 1772540330281880330} + - component: {fileID: 5001828615128102822} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5368842645891760372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3272932953098839055} + 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: 7684111156226357852} + 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: 227.12497, y: 0} + m_SizeDelta: {x: 698.55, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1772540330281880330 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3272932953098839055} + m_CullTransparentMesh: 0 +--- !u!114 &5001828615128102822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3272932953098839055} + 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.85098046, g: 0.8313726, b: 0.7019608, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4ECA\u65E5\u4E0D\u518D\u5F39\u51FA\u6B64\u63D0\u793A" + LanguageIndex: 11267 --- !u!1 &3278630914111398434 GameObject: m_ObjectHideFlags: 0 @@ -12316,6 +12470,145 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4247764897554813668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2691976750628824221} + - component: {fileID: 3331384868091868210} + - component: {fileID: 7137803917261988264} + - component: {fileID: 2423811529065476124} + - component: {fileID: 9222940583704272494} + m_Layer: 5 + m_Name: CancelBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2691976750628824221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247764897554813668} + 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: 3181736499007880953} + m_Father: {fileID: 2019051998027851512} + 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: -208.4, y: -265.09998} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3331384868091868210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247764897554813668} + m_CullTransparentMesh: 0 +--- !u!114 &7137803917261988264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247764897554813668} + 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &2423811529065476124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247764897554813668} + 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: 3 + 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: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + 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: 7137803917261988264} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &9222940583704272494 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247764897554813668} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &4348809421390657025 GameObject: m_ObjectHideFlags: 0 @@ -12364,6 +12657,7 @@ RectTransform: - {fileID: 1013858685} - {fileID: 1564542999} - {fileID: 8279573323771056633} + - {fileID: 2019051998027851512} m_Father: {fileID: 4982919456788885506} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13102,6 +13396,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u672C\u8F6E\u53EF\u4F7F\u7528\u6B21\u6570\uFF1A" LanguageIndex: 11272 +--- !u!1 &5043333101265698127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3181736499007880953} + - component: {fileID: 3004958858823696661} + - component: {fileID: 5913201398881316953} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3181736499007880953 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5043333101265698127} + 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: 2691976750628824221} + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3004958858823696661 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5043333101265698127} + m_CullTransparentMesh: 0 +--- !u!114 &5913201398881316953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5043333101265698127} + 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.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u53D6 \u6D88" + LanguageIndex: 10407 --- !u!1 &5052683625082334632 GameObject: m_ObjectHideFlags: 0 @@ -14806,6 +15180,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53D6 \u6D88" LanguageIndex: 10407 +--- !u!1 &5872583321899263746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7276262324084077394} + - component: {fileID: 7070533773110765111} + - component: {fileID: 7617414154487472087} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7276262324084077394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5872583321899263746} + 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: 7684111156226357852} + 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: -148.15, y: -2.3} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7070533773110765111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5872583321899263746} + m_CullTransparentMesh: 0 +--- !u!114 &7617414154487472087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5872583321899263746} + 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: d1e04308c0a66644a804a2800a96d3a2, 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 &5940672274977946615 GameObject: m_ObjectHideFlags: 0 @@ -15442,6 +15890,54 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6270758019762623756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2019051998027851512} + - component: {fileID: 2573592626642913236} + m_Layer: 5 + m_Name: GeneralPopup_RecruitConfirm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2019051998027851512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270758019762623756} + 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: 6445394186152590337} + - {fileID: 1218256107253681808} + - {fileID: 2691976750628824221} + - {fileID: 6271611571117237502} + m_Father: {fileID: 2925180131101153177} + m_RootOrder: 19 + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2573592626642913236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270758019762623756} + m_CullTransparentMesh: 0 --- !u!1 &6289078681574284627 GameObject: m_ObjectHideFlags: 0 @@ -16637,6 +17133,43 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &6725840863423595181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1218256107253681808} + m_Layer: 5 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1218256107253681808 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6725840863423595181} + 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: 2917797512123312177} + - {fileID: 7684111156226357852} + m_Father: {fileID: 2019051998027851512} + 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, y: 0} + m_SizeDelta: {x: 810.6, y: 341} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6729897824684249893 GameObject: m_ObjectHideFlags: 0 @@ -16981,6 +17514,117 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6847301153928378031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7684111156226357852} + - component: {fileID: 149042227916095358} + - component: {fileID: 3078762375920830208} + - component: {fileID: 3030399075193449111} + m_Layer: 5 + m_Name: Btn1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7684111156226357852 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6847301153928378031} + 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: 7276262324084077394} + - {fileID: 5798039360851658602} + - {fileID: 5368842645891760372} + m_Father: {fileID: 1218256107253681808} + 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, y: -131} + m_SizeDelta: {x: 463.8, y: 71} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &149042227916095358 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6847301153928378031} + m_CullTransparentMesh: 0 +--- !u!114 &3078762375920830208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6847301153928378031} + 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: 3030399075193449111} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &3030399075193449111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6847301153928378031} + 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 &6864998799337060965 GameObject: m_ObjectHideFlags: 0 @@ -20011,6 +20655,145 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8555925391596926500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6271611571117237502} + - component: {fileID: 5297989892434129598} + - component: {fileID: 2655235133189784056} + - component: {fileID: 7276044606391224999} + - component: {fileID: 1962757275719576073} + m_Layer: 5 + m_Name: ConfirmBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6271611571117237502 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555925391596926500} + 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: 4358559454917957471} + m_Father: {fileID: 2019051998027851512} + 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: 168.20007, y: -265.09998} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5297989892434129598 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555925391596926500} + m_CullTransparentMesh: 0 +--- !u!114 &2655235133189784056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555925391596926500} + 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &7276044606391224999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555925391596926500} + 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: 3 + 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: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + 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: 2655235133189784056} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &1962757275719576073 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555925391596926500} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8585971491395229052 GameObject: m_ObjectHideFlags: 0 @@ -20150,6 +20933,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8594186825507610260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6445394186152590337} + - component: {fileID: 2599599546641503659} + - component: {fileID: 7202786113443617157} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6445394186152590337 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8594186825507610260} + 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: 2019051998027851512} + 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: 305.83} + m_SizeDelta: {x: 384.31, y: 64.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2599599546641503659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8594186825507610260} + m_CullTransparentMesh: 0 +--- !u!114 &7202786113443617157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8594186825507610260} + 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.9882353, g: 0.9607843, b: 0.827451, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8BBE \u7F6E" + LanguageIndex: 11266 --- !u!1 &8603848061001280458 GameObject: m_ObjectHideFlags: 0 @@ -20577,6 +21440,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8941645325537231049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2917797512123312177} + - component: {fileID: 624669742079600518} + - component: {fileID: 5114761160151912867} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2917797512123312177 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8941645325537231049} + 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: 1218256107253681808} + 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: 800, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &624669742079600518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8941645325537231049} + m_CullTransparentMesh: 0 +--- !u!114 &5114761160151912867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8941645325537231049} + 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: 0.98039216, b: 0.83137256, 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: 39 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8FD9\u662F\u4E00\u5806\u903C\u903C\u8D56\u8D56" + LanguageIndex: 11147 --- !u!1 &8953766695355602430 GameObject: m_ObjectHideFlags: 0 @@ -20964,6 +21907,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6D88\u8017" LanguageIndex: 10512 +--- !u!1 &9107682983792922034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4358559454917957471} + - component: {fileID: 1375907722345897540} + - component: {fileID: 4842612964428806403} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4358559454917957471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9107682983792922034} + 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: 6271611571117237502} + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1375907722345897540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9107682983792922034} + m_CullTransparentMesh: 0 +--- !u!114 &4842612964428806403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9107682983792922034} + 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.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4F7F \u7528" + LanguageIndex: 11274 --- !u!1 &9126933682546045342 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 55b1266114..e99a6ef9d4 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1377,6 +1377,7 @@ HELP_TYPE = { OpenHappy=50,-- 开服狂欢 OpenSevenDay=52,-- 开服狂欢 SoulPrintCommond=53,-- 魂印合成 + Sunro=54,--森罗环境 EquipCompose=55,-- 装备合成 TreasureCompose=56,-- 宝物合成 TimeLimitedCall=57,-- 限时召唤 @@ -1756,6 +1757,7 @@ GENERAL_POPUP_TYPE={ EquipBatchSell=16,--装备批量出售 EquipSingleSell=17,--装备单种出售 拉条 TrialBomb=18,--次元炸弹 + RecruitConfirm=19,----神将召唤、限时召唤、乾坤宝盒 二次确认界面 } --抽卡类型 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 7f6e647f11..914b16a02b 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2278,4 +2278,5 @@ [12277] = "未查询到符合条件的装备!", [12278] = "%d天%02d时", [12279] = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力", + [12280] = "该神将在巅峰赛阵容中已上阵", } diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index 8f74d30f60..9a5c5f108a 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -590,7 +590,7 @@ end -- 通过总轮数获取当前阶段名称 function this.GetTurnNameByRoundTimes(roundTimes,curTurn) - LogGreen("roundTimes "..roundTimes) + -- LogGreen("roundTimes "..roundTimes) if not roundTimes or roundTimes <= 0 then return Language[10122] end diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 21d8417ea6..b8fc9ba60d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -20,7 +20,6 @@ function BagPanel:InitComponent() tabs1[i] = Util.GetGameObject(self.transform, "box/Btn" .. i) tabs1RedPoint[i] = Util.GetGameObject(self.transform, "box/Btn" .. i .. "/redPoint") end - --this.tabs1Go = Util.GetGameObject(self.transform, "Tabs1") this.selectBtn1 = Util.GetGameObject(self.gameObject, "selectBtn") this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform) this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) @@ -29,7 +28,6 @@ function BagPanel:InitComponent() this.ItemView = Util.GetGameObject(self.gameObject, "ItemView") this.ItemViewEffect = Util.GetGameObject(self.gameObject, "ItemView/GameObject/effects") this.item = Util.GetGameObject(self.gameObject, "Item") - --this.itemEffect = Util.GetGameObject(self.gameObject, "Item/effects") this.grid = Util.GetGameObject(self.gameObject, "scroll/grid") this.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") this.isBagPanel = true @@ -61,7 +59,6 @@ function BagPanel:BindEvent() Util.AddClick(this.BtnBack, function() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) - --UIManager.OpenPanel(UIName.MainPanel) self:ClosePanel() end) for i = 0, 7 do @@ -108,7 +105,6 @@ end function this:SetSelectBtn(_btn) if _btn then this.selectBtn1:SetActive(true) - --this.selectBtn1.transform.localPosition = _btn.transform.localPosition this.selectBtn1.transform:SetParent(_btn.transform) this.selectBtn1.transform.localPosition = Vector3.zero Util.GetGameObject(this.selectBtn1.transform, "Text"):GetComponent("Text").text = Util.GetGameObject(_btn.transform, "Text"):GetComponent("Text").text @@ -130,13 +126,6 @@ function this:OnClickAllBtn() for i = 1, #curAllEquipTreasure do table.insert(itemData, curAllEquipTreasure[i]) end - --for i = 1, #allEquipData do - -- table.insert(itemData, allEquipData[i]) - --end - --local allTalisman = TalismanManager.GetAllTalismanData(false, "0") - --for i = 1, #allTalisman do - -- table.insert(itemData, allTalisman[i]) - --end local soulPrintData = BagManager.GetAllSoulPrintData() for i,v in ipairs(soulPrintData) do table.insert(itemData, v) @@ -166,7 +155,6 @@ function this.OnClickTabBtn(_index, _clickBtn) elseif _index == 0 then this:OnClickAllBtn() elseif (_index == ItemBaseType.SoulPrint) then - --itemData = BagManager.GetBagItemDataByItemType(ItemBaseType.SoulPrint) itemData = BagManager.GetAllSoulPrintData() itemNumText.text = Language[10189]..#itemData.."/"..specialConfig[9].Value this:SetItemData(itemData, ItemBaseType.SoulPrint) @@ -273,7 +261,6 @@ function this.SingleItemDataShow(_go, _itemData) if(UI_Effect_Kuang_JinSe) then UI_Effect_Kuang_JinSe:SetActive(false) end - --local UI_Effect_Kuang_HongSe = Util.GetGameObject(_go.transform, "GameObject/effects/UI_Effect_Kuang_HongSe") upHeroInage:SetActive(false) local frameMask = Util.GetGameObject(_go.transform, "GameObject/item/frameMask") frameMask:SetActive(false) @@ -288,7 +275,6 @@ function this.SingleItemDataShow(_go, _itemData) strongLv.gameObject:SetActive(false) refine.gameObject:SetActive(false) if _itemData.itemConfig then - --UI_Effect_Kuang_HongSe:SetActive(_itemData.itemConfig.Quantity == 6 ) Util.GetGameObject(_go.transform, "GameObject/item/innateImage"):SetActive(false) Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):SetActive(false) num:SetActive(true) @@ -361,20 +347,15 @@ function this.SingleItemDataShow(_go, _itemData) Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circle) UI_Effect_Kuang_JinSe.gameObject:SetActive(true) num:SetActive(false) - -- Util.GetGameObject(_go.transform, "GameObject/item/resetLv"):GetComponent("Text").text = "+" .. _itemData.level end end local redPoint = Util.GetGameObject(_go.gameObject, "GameObject/redPoint") Util.AddOnceClick(Util.GetGameObject(_go.gameObject, "GameObject/item/frame"), function() if _itemData.itemConfig then if _itemData.itemConfig.ItemBaseType == ItemBaseType.Equip then - -- if _itemData.itemConfig.Quantity >= 4 then - -- EquipManager.SetNotNewEquipAnyMore(_itemData.id) - -- redPoint:SetActive(false) - -- end UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData, function() this.OnClickTabBtn(sortIndex, sortIndexBtnGo) - end) + end,nil,true) elseif _itemData.itemConfig.ItemType == ItemType.SelfBox then--自选宝箱 UIManager.OpenPanel(UIName.RewardBoxPanel, _itemData, function() this.OnClickTabBtn(sortIndex, sortIndexBtnGo) @@ -403,7 +384,6 @@ function this.SingleItemDataShow(_go, _itemData) if _itemData.num >= _itemData.itemConfig.UsePerCount then UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() this.OnClickTabBtn(sortIndex, sortIndexBtnGo) - --UIManager.ClosePanel(UIName.RewardItemSingleShowPopup) end) else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.id, function() @@ -415,7 +395,6 @@ function this.SingleItemDataShow(_go, _itemData) --宝器 UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.idDyn,_itemData.id, _itemData.lv,_itemData.refineLv, function() this.OnClickTabBtn(sortIndex, sortIndexBtnGo) - --UIManager.ClosePanel(UIName.RewardTalismanSingleShowPopup) end) elseif _itemData.itemConfig.ItemBaseType == ItemBaseType.SoulPrint then --魂印 @@ -429,11 +408,6 @@ function this.SingleItemDataShow(_go, _itemData) end end) - --Util.AddOnceClick(pokemonFrame, function() - -- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.id, function() - -- this.OnClickTabBtn(sortIndex, sortIndexBtnGo) - -- end) - --end) --显示红点 redPoint:SetActive(false) if _itemData.itemConfig.ItemType == ItemType.Equip then @@ -503,9 +477,6 @@ function BagPanel:OnShow() else this:OnClickAllBtn() end - - --this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) - --this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.BagPanel }) SoundManager.PlayMusic(SoundConfig.BGM_Main) BagManager.isBagPanel = true @@ -543,22 +514,13 @@ function BagPanel:OnSortingOrderChange() Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer) end orginLayer = this.sortingOrder - --Util.AddParticleSortLayer(this.itemEffect, self.sortingOrder - this.EffectOrginLayer) this.EffectOrginLayer = self.sortingOrder - - --this.bg.overrideSorting = true - --this.scroll.overrideSorting = true - --this.scroll.sortingOrder = self.sortingOrder - 10 - --this.bg.sortingOrder = self.sortingOrder - 20 - this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder }) end --界面关闭时调用(用于子类重写) function BagPanel:OnClose() this.noneImage:SetActive(false) - --BagManager.SetItemNewRewPooint() - -- EquipManager.SetEquipNewRewPooint() BagManager.isBagPanel = false if isFristOpenTime then isFristOpenTime:Stop() diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 74b5db9193..763ef8421a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -573,6 +573,7 @@ function this.UpdateHeroDatas(_msgHeroData) this.SetEquipTreasureUpHeroDid(heroData.jewels,heroData.dynamicId) this.SetTalismanLv(heroData.dynamicId,heroData.talismanList) ExpeditionManager.InitHeroHpValue(heroData.dynamicId) + heroData.warPower = HeroManager.CalculateHeroAllProValList(1, heroData, false)[HeroProType.WarPower] --this.SetSoulPrintUpHeroDid(heroData.soulPrintList,heroData.dynamicId) --this.GetSingleProScoreVal() end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua index f0390515c3..8e12b746f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua @@ -115,7 +115,8 @@ function this:FormationAdapter(msg) demon:SetActive(true) local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon)) - Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).Star)) + local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId) + Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality,heroConFig.Star)) Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName SetHeroStars(starGrid, curData.hero.star) proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName)) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index d3a473eaf8..11777bce3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -67,7 +67,7 @@ function this.InitHeroData(_msgHeroList) end this.UpdateHeroLvEnd() --赋值每个星级的英雄等级上限 - this.UpdateHeroPower() + -- this.UpdateHeroPower() --赋值英雄战力 end @@ -155,6 +155,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) if isFindHandBook then --图鉴 PlayerManager.SetHeroHandBookListData(heroData.id, heroData.star) end + heroData.warPower = this.CalculateHeroAllProValList(1, heroData.dynamicId, false)[HeroProType.WarPower] --远征初始化血量 --ExpeditionManager.InitHeroHpValue(heroData) end @@ -342,7 +343,7 @@ function this.GetHeroFormationStr(teamId) return Language[11108] -- 1001 elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then - return Language[11101] + return Language[12280] end end return "" @@ -366,7 +367,7 @@ function this.GetHeroFormationStr2(teamId) elseif teamId == FormationTypeDef.EXPEDITION then return Language[10699], FormationTypeDef.EXPEDITION elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then - return Language[11110], FormationTypeDef.ARENA_TOM_MATCH + return Language[12280], FormationTypeDef.ARENA_TOM_MATCH end end return "" diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 1971a42821..d092fd4011 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -55,7 +55,6 @@ function this:InitComponent() -- 试炼副本相关组件 this.leftUp = Util.GetGameObject(self.gameObject, "leftUp") - -- this.leftRelife = Util.GetGameObject(self.gameObject, "leftDown/leftLifeRoot") this.centerDonwn = Util.GetGameObject(self.gameObject, "centerDown") missionView.InitComponent(self.gameObject, this) @@ -93,16 +92,6 @@ function this:BindEvent() Util.AddClick(this.btnAchive, function () UIManager.OpenPanel(UIName.EliteCarbonAchievePanel, MapManager.GetCurCarbonId(), false, 1) end) - - -- 背包 - -- Util.AddClick(this.btnBag, function () - -- UIManager.OpenPanel(UIName.MapBagPopup) - -- end) - - --队伍 - -- Util.AddClick(this.btnTeam, function () - -- UIManager.OpenPanel(UIName.MapFormationInfoPopup) - -- end) --排行 Util.AddClick(this.btnRank, function () UIManager.OpenPanel(UIName.CarbonScoreSortPanel,1) @@ -148,8 +137,6 @@ function this.SetEndlessShow() end) end) else - -- UIManager.OpenPanel(UIName.MapLeavePanel) --暂时不要了 - -- UIManager.OpenPanel(UIName.MapStatsPanel,true)--不需要确认退出了 Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0) end end @@ -216,12 +203,7 @@ function this:OnOpen(...) EndLessMapManager.EndLessRoleDead = true -- 永久隐藏设置按钮 ctrlView.Init() - -- 如果不是无尽副本,默认跳过战斗 - --if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then - -- CarbonManager.isPassFight = EndLessMapManager.isSkipFight == 1 - --else - CarbonManager.isPassFight = true - --end + CarbonManager.isPassFight = true -- 在这设置所有副本的初始化设置 -- 根据副本类型显示 @@ -289,7 +271,6 @@ function this.InitCarbonSet() --如果是在序章 local isStartMap = MapManager.curMapId == 100 - -- this.BtnBack:SetActive(not isStartMap) this.BtnBack2:SetActive(not isStartMap) end @@ -297,7 +278,6 @@ end -- 根据副本的类型显示组件 function this.InitCompShow(type) this.leftUp:SetActive(type == 2) - -- this.leftRelife:SetActive(type == 2) this.centerDonwn:SetActive(true) end @@ -351,7 +331,6 @@ function this.OnMapDataChange(refreshType) -- 增加地图移动速度 elseif refreshType == 2 then -- 增加视野范围 - --fogSize = FoodBuffManager.fogSize local u, v = Map_Pos2UV(MapManager.curPos) TileMapView.UpdateWarFog(u, v, MapManager.fogSize) @@ -565,9 +544,6 @@ function this.BackToCarbonPanel() end end SwitchPanel.OpenPanel(UIName.MainPanel) - -- SwitchPanel.OpenPanel(panelNeedOpen[CarbonManager.difficulty], function() - -- UIManager.ClosePanel(UIName.MapPanel) - -- end) end -- 刷新红点 @@ -739,12 +715,6 @@ function this.OnDeadCount(startTime, lastPos) ctrlView.SetCtrlState(true) -- 死亡次前端无奈的加一次 MapManager.deadCount = MapManager.deadCount + 1 - -- if CarbonManager.difficulty == 2 then - -- trialPanel.OnRoleDead() - -- if MapTrialManager.GetRelifeTimes() - MapManager.deadCount < 0 then -- 次数用完出图 - -- return - -- end - -- end -- 清空血条值 playerView.InitRoleHp(false) playerView.SetBattleState(false) @@ -769,8 +739,6 @@ end function this.StopWalking() ctrlView.OnRoleDead() -- 换层时路径不一定完了,不弹完会卡死 - --ctrlView.CallListPop() - end function this.CallListPop() diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 1b86a00a1e..1ab68c0606 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -94,7 +94,7 @@ function TrialMapPanel:BindEvent() --帮助按钮 Util.AddClick(this.helpBtn,function() - UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Resolve_Recall,this.helpPos.x,this.helpPos.y) + UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y) end) --设置按钮 Util.AddClick(MapPanel.btnSetting, function () @@ -127,7 +127,7 @@ end --界面打开时调用(用于子类重写) function TrialMapPanel:OnOpen() this.powerRoot:SetActive(CarbonManager.difficulty == 2) - this.btnBomb:SetActive(CarbonManager.difficulty == 2) + this.btnBomb:SetActive(false)--CarbonManager.difficulty == 2) -- 商店 this.buffShop:SetActive(CarbonManager.difficulty == CARBON_TYPE.TRIAL) this.normalShop:SetActive(CarbonManager.difficulty == CARBON_TYPE.TRIAL) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua index ddd9ba707d..ffc7b1a3d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua @@ -37,9 +37,7 @@ function this.ParseMissionState(missions, isInit) local missionItem = missions Log(Language[11366].. missionItem.itemId) - --Log("进图初始化副本任务IDState "..missionItem.state) Log(Language[11367]..missionItem.missionStep) - --Log("进图初始化副本任务ID完成时间" .. missionItem.time) --Log("missionItem.isOpen ".. string.format("%s", missionItem.isOpen)) local id = missionItem.itemId -- 任务索引值 @@ -295,7 +293,7 @@ end local directFight = function(showType, eventId, showValues, options) local monsterGroupId = options[1] --遇到怪就停在原处 - -- Game.GlobalEvent:DispatchEvent(GameEvent.Map.StopWalk) + Game.GlobalEvent:DispatchEvent(GameEvent.Map.StopWalk) --获取自动战斗 local t=(PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1) and PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1)==1) and 1 or 0 @@ -303,25 +301,6 @@ local directFight = function(showType, eventId, showValues, options) Game.GlobalEvent:DispatchEvent(GameEvent.Map.ShowEnemyInfo, monsterGroupId,eventId,showValues) else--快速战斗 -- --如果英雄阵亡 无法选择其进行战斗 - -- for i, v in ipairs(MapManager.trialHeroInfo) do - -- local num = #MapManager.trialHeroInfo - -- if v.heroHp<=0 then - -- num = num -1 - -- if num == 0 then - -- PopupTipPanel.ShowTip("猎妖师全部死亡,无法进入战斗!") - -- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) - -- return - -- end - -- end - -- -- if MapTrialManager.selectHeroDid==v.heroId then - -- -- if v.heroHp<=0 then - -- -- PopupTipPanel.ShowTip(Language[11247]) - -- -- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) - -- -- return - -- -- end - -- -- end - -- end - --先保存编队 local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_DREAMLAND) local choosedList={} @@ -334,8 +313,6 @@ local directFight = function(showType, eventId, showValues, options) MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid) CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg) --更新精气值 - -- LogGreen("战斗后的更新精气值:"..msg.essenceValue) - -- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了 MapTrialManager.powerValue = msg.essenceValue -- --召唤Boss if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then @@ -411,9 +388,6 @@ local trailBuffPanel = function(showType, eventId, showValues, options) Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) Game.GlobalEvent:DispatchEvent(GameEvent.Map.ProgressChange, 1, options[1]) end) - -- if not UIManager.IsOpen(UIName.BuffOptionPanel) then - -- UIManager.OpenPanel(UIName.BuffOptionPanel, eventId) - -- end end -- 无尽商店 @@ -481,9 +455,6 @@ local funcList2={ [7]=function() --踩宝箱只发0 NetManager.GetTrialBoxRewardRequest(0,function(msg) Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove, MapManager.curTriggerPos)--删除宝箱点 - -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function() - -- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) - -- end) local data = TrialMiniGameManager.IdToNameIconNum(msg.boxDrop.itemlist[1].itemId,msg.boxDrop.itemlist[1].itemNum) PopupTipPanel.ShowColorTip(data[1],data[2],data[3]) Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) @@ -511,7 +482,6 @@ local funcList2={ --地图点触发 function this.MapPointTrigger(style) local i=0 - -- Game.GlobalEvent:DispatchEvent(GameEvent.Map.StopWalk) for k, v in pairs(MapManager.mapPointList) do if MapPointConfig[v] and MapPointConfig[v].Style==style then i =style @@ -520,7 +490,6 @@ function this.MapPointTrigger(style) LogPink(i) if funcList2[i] then funcList2[i]() - -- Game.GlobalEvent:DispatchEvent(GameEvent.Guide.EventTriggered, eventId) end end @@ -532,10 +501,6 @@ function this.GetAllRewardTrigger() and PlayerPrefs.GetInt(var)==1) and 1 or 0 if t==0 then return end NetManager.GetTrialBoxRewardRequest(t,function(msg) - - -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function() - -- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) - -- end) Timer.New(function () for key, value in pairs(MapManager.mapPointList) do -- LogPink("["..key.."] "..value) @@ -546,11 +511,6 @@ function this.GetAllRewardTrigger() Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove,key)--删除所有的buff点 end end - - -- local data = TrialMiniGameManager.IdToNameIconNum(msg.boxDrop.itemlist[1].itemId,msg.boxDrop.itemlist[1].itemNum) - -- PopupTipPanel.ShowColorTip(data[1],data[2],data[3]) - -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1) - local thread=coroutine.start(function() --宝箱奖励掉落 for i = 1, #msg.boxDrop.itemlist do diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index f62f2266f9..a66f2743db 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -159,6 +159,10 @@ function this.RefreshUpdateIndication(buffer) CheckRedPointStatus(RedPointType.Guild_AidMy) LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime) + --三个抽奖勾选重置 + PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0) + PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0) + PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0) end --服务器推送红点信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua index 848abe749b..62cbeb43ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua @@ -155,26 +155,41 @@ function QianKunBox:refreshBtnShow() return end end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen) if n==bType.Btn1 then if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+1>privilegeConfig[maxtimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) return end - RecruitManager.RecruitRequest(m.type, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel,msg.drop) - CheckRedPointStatus(RedPointType.QianKunBox) - end,freeTimesId) + local recruitOne = function() + RecruitManager.RecruitRequest(m.type, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 + UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop) + CheckRedPointStatus(RedPointType.QianKunBox) + end,freeTimesId) + end + if state==0 and d[1] ==16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxSingle,recruitOne) + else + recruitOne() + end elseif n==bType.Btn10 then if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+10>privilegeConfig[maxtimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) return end - RecruitManager.RecruitRequest(m.type, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel,msg.drop) - CheckRedPointStatus(RedPointType.QianKunBox) - end,freeTimesId) + local recruitTen = function() + RecruitManager.RecruitRequest(m.type, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 + UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop) + CheckRedPointStatus(RedPointType.QianKunBox) + end,freeTimesId) + end + if state==0 and d[1] ==16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxTen,recruitTen) + else + recruitTen() + end end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index 060a095c28..ffbd9affc3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -279,26 +279,42 @@ function TimeLimitedCall:RefreshGetHeroTimes() return end end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen) if n==bType.Btn1 then if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+1>privilegeConfig[maxtimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) return end - RecruitManager.RecruitRequest(m.type, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1) - CheckRedPointStatus(RedPointType.TimeLimited) - end,freeTimesId) + local recruitOne = function() + RecruitManager.RecruitRequest(m.type, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1) + CheckRedPointStatus(RedPointType.TimeLimited) + end,freeTimesId) + end + if state==0 and d[1] ==16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitSingle,recruitOne) + else + recruitOne() + end + elseif n==bType.Btn10 then if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+10>privilegeConfig[maxtimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) return end - RecruitManager.RecruitRequest(m.type, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10) - CheckRedPointStatus(RedPointType.TimeLimited) - end,freeTimesId) + local recruitTen = function() + RecruitManager.RecruitRequest(m.type, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10) + CheckRedPointStatus(RedPointType.TimeLimited) + end,freeTimesId) + end + if state==0 and d[1] ==16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitTen,recruitTen) + else + recruitTen() + end end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua index 6e479d0ef5..7492c87a3b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua @@ -41,6 +41,8 @@ local contentScripts = { [17] = {view = require("Modules/Popup/View/GeneralPopup_EquipSingleSell"), panelName = "GeneralPopup_EquipSingleSell",type=GENERAL_POPUP_TYPE.EquipSingleSell}, --森罗次元炸弹 [18] = {view = require("Modules/Popup/View/GeneralPopup_TrialBomb"), panelName = "GeneralPopup_TrialBomb",type=GENERAL_POPUP_TYPE.TrialBomb}, + --神将召唤、限时召唤、乾坤宝盒 二次确认界面 + [19] = {view = require("Modules/Popup/View/GeneralPopup_RecruitConfirm"), panelName = "GeneralPopup_RecruitConfirm",type=GENERAL_POPUP_TYPE.RecruitConfirm}, } --子模块预设 local contentPrefabs={} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua index adeff8c503..58ce76069f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua @@ -115,7 +115,7 @@ function RewardEquipSingleShowPopup:OnOpen(_equipData, _func,_isRewardItemPop,_i equipData=_equipData func=_func isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false - isShowfenjie = not (_isShowfenjie or false) + isShowfenjie = not not (_isShowfenjie or false) end function RewardEquipSingleShowPopup:OnShow() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua new file mode 100644 index 0000000000..9169548c5f --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -0,0 +1,88 @@ +----- 招募二次确认弹窗 ----- +local this = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 + +local i +local func + +function this:InitComponent(gameObject) + this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") + this.root = Util.GetGameObject(gameObject, "Root") + this.confirm = Util.GetGameObject(gameObject, "ConfirmBtn") + this.cancel = Util.GetGameObject(gameObject, "CancelBtn") + this.btn=Util.GetGameObject(this.root,"Btn1") + this.rootText=Util.GetGameObject(this.root,"Text"):GetComponent("Text") +end + +function this:BindEvent() + Util.AddClick(this.confirm,function() + parent:ClosePanel() + if func then + func() + end + end) + Util.AddClick(this.cancel,function() + parent:ClosePanel() + end) +end + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnShow(_parent,...) + parent=_parent + sortingOrder = _parent.sortingOrder + --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 + local _args = {...} + func = _args[2] + this.titleText.text=Language[11351] + local go=Util.GetGameObject(this.btn,"Go") + local var + if _args[1] == RecruitType.Single then + var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten + this.rootText.text = "确认花费200妖晶进行1次神将召唤?" + elseif _args[1] == RecruitType.QianKunBoxSingle then + var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen + this.rootText.text = "确认花费200妖晶抽取1次乾坤宝盒?" + elseif _args[1] == RecruitType.TimeLimitSingle then + var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen + this.rootText.text = "确认花费200妖晶进行1次限时召唤? " + elseif _args[1] == RecruitType.Ten then + var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten + this.rootText.text = "确认花费2000妖晶进行10次神将召唤?" + elseif _args[1] == RecruitType.QianKunBoxTen then + var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen + this.rootText.text = "确认花费2000妖晶抽取10次乾坤宝盒?" + elseif _args[1] == RecruitType.TimeLimitTen then + var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen + this.rootText.text = "确认花费2000妖晶进行10次限时召唤?" + end + + Util.AddOnceClick(this.btn,function() + this.btnClick=(this.btnClick and this.btnClick==1) and 0 or 1 + LogPink(this.btnClick) + PlayerPrefs.SetInt(var,this.btnClick) + go:SetActive(PlayerPrefs.GetInt(var)==1) + end) + + if PlayerPrefs.HasKey(var) then + go:SetActive(PlayerPrefs.GetInt(var)==1) + else + go:SetActive(false) + end +end + +function this:OnClose() +end + +function this:OnDestroy() + this.btn={} +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua.meta b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua.meta new file mode 100644 index 0000000000..88712952e1 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d3cd0fe4ce84524c9de9034cb67d2bf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua index 773ba4aa1f..246c0f5ba7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua @@ -195,27 +195,46 @@ function this.UpdatePanelData() return end end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten) if n==bType.Btn1 then if PrivilegeManager.GetPrivilegeUsedTimes(maxTimesId)+1>privilegeConfig[maxTimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) return end - RecruitManager.RecruitRequest(m.type, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1) - end,v.privilegeId) + --抽卡 + local recruitOne = function() + RecruitManager.RecruitRequest(m.type, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,1)--记录抽卡次数 + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1) + end,v.privilegeId) + end + if state==0 and d[1] ==16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Single,recruitOne) + else + recruitOne() + end + elseif n==bType.Btn10 then if PrivilegeManager.GetPrivilegeUsedTimes(maxTimesId)+10>privilegeConfig[maxTimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) return end - RecruitManager.RecruitRequest(m.type, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10) - if m.type == 11 then - RecruitManager.isTenRecruit = 1 - end - end,v.privilegeId) + --抽卡 + local recruitTen = function() + RecruitManager.RecruitRequest(m.type, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10) + if m.type == 11 then + RecruitManager.isTenRecruit = 1 + end + end,v.privilegeId) + end + if state==0 and d[1] ==16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Ten,recruitTen) + else + recruitTen() + end + end end) end diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 8f9b8feab3..a87c1efef6 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2277,3 +2277,4 @@ 12277,δѯװ 12278,%d%02dʱ 12279,ϵ񽫶50%˺\nϵ񽫽50% +12280,۷ diff --git a/data_execl/base_data/ActivityRewardConfig.xlsx b/data_execl/base_data/ActivityRewardConfig.xlsx index 6e184d5ffa..cd8cccfb3c 100644 Binary files a/data_execl/base_data/ActivityRewardConfig.xlsx and b/data_execl/base_data/ActivityRewardConfig.xlsx differ diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx index c2fe5ad9d6..8082ea9e4e 100644 Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ diff --git a/data_execl/base_data/ExpeditionFloorConfig.xlsx b/data_execl/base_data/ExpeditionFloorConfig.xlsx index 068df1c171..62bcfb462a 100644 Binary files a/data_execl/base_data/ExpeditionFloorConfig.xlsx and b/data_execl/base_data/ExpeditionFloorConfig.xlsx differ diff --git a/data_execl/base_data/ExpeditionNodeConfig.xlsx b/data_execl/base_data/ExpeditionNodeConfig.xlsx index a1468cb3e4..5cad5f96a5 100644 Binary files a/data_execl/base_data/ExpeditionNodeConfig.xlsx and b/data_execl/base_data/ExpeditionNodeConfig.xlsx differ diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index 7fc8121e15..292f9cf430 100644 Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ diff --git a/data_execl/base_data/MainMapIconConfig.xlsx b/data_execl/base_data/MainMapIconConfig.xlsx index a5a408903e..c17bb016a7 100644 Binary files a/data_execl/base_data/MainMapIconConfig.xlsx and b/data_execl/base_data/MainMapIconConfig.xlsx differ diff --git a/data_execl/base_data/MazeTreasure.xlsx b/data_execl/base_data/MazeTreasure.xlsx index ca4dbe86cd..6bcbee6952 100644 Binary files a/data_execl/base_data/MazeTreasure.xlsx and b/data_execl/base_data/MazeTreasure.xlsx differ diff --git a/data_execl/base_data/QAConfig.xlsx b/data_execl/base_data/QAConfig.xlsx index 3e08277328..8115cb8274 100644 Binary files a/data_execl/base_data/QAConfig.xlsx and b/data_execl/base_data/QAConfig.xlsx differ diff --git a/data_execl/base_data/RewardItemConfig.xlsx b/data_execl/base_data/RewardItemConfig.xlsx index 1f8413297e..4e3abf9473 100644 Binary files a/data_execl/base_data/RewardItemConfig.xlsx and b/data_execl/base_data/RewardItemConfig.xlsx differ diff --git a/data_execl/base_data/SpecialConfig.xlsx b/data_execl/base_data/SpecialConfig.xlsx index dac208fc6a..27357a9f40 100644 Binary files a/data_execl/base_data/SpecialConfig.xlsx and b/data_execl/base_data/SpecialConfig.xlsx differ