diff --git a/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/r_guanka_zinrenshangcheng_zh.png b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/r_guanka_zinrenshangcheng_zh.png new file mode 100644 index 0000000000..7657465c5c Binary files /dev/null and b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/r_guanka_zinrenshangcheng_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/r_guanka_zinrenshangcheng_zh.png.meta b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/r_guanka_zinrenshangcheng_zh.png.meta new file mode 100644 index 0000000000..8315fe2093 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/r_guanka_zinrenshangcheng_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9ec814afc8884984bab3b5730d3fc597 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 972aaf6cce313ce4d91bd1a6def5075f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FightAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 450b322c25..3b102256ab 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -184,7 +184,7 @@ RectTransform: - {fileID: 262793656545805022} - {fileID: 2849168688064822341} m_Father: {fileID: 1012972711} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4865,7 +4865,7 @@ ParticleSystem: --- !u!199 &325797788 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -5040,6 +5040,102 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7\u83B7" LanguageIndex: 10531 +--- !u!1 &524877547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 524877548} + - component: {fileID: 524877551} + - component: {fileID: 524877550} + - component: {fileID: 524877549} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &524877548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 524877547} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0004463, y: 1.0004463, z: 1.0004463} + m_Children: [] + m_Father: {fileID: 1876058329} + 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: 48.5, y: -60} + m_SizeDelta: {x: 127, y: 35.65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &524877551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 524877547} + m_CullTransparentMesh: 0 +--- !u!114 &524877550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 524877547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &524877549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 524877547} + 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.42745098, g: 0.98039216, b: 0.33333334, 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "2\u592923\u5C0F\u65F6" + LanguageIndex: 10517 --- !u!1 &657899908 GameObject: m_ObjectHideFlags: 0 @@ -9657,7 +9753,7 @@ ParticleSystem: --- !u!199 &689865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10288,7 +10384,7 @@ RectTransform: - {fileID: 917411733590987729} - {fileID: 5427344268651350439} m_Father: {fileID: 1012972711} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -10414,6 +10510,7 @@ RectTransform: m_Children: - {fileID: 698392784} - {fileID: 5391497229806396012} + - {fileID: 1876058329} - {fileID: 969518017} - {fileID: 2110103215} - {fileID: 107230295} @@ -15726,7 +15823,7 @@ ParticleSystem: --- !u!199 &1640369986 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15785,6 +15882,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &1664913856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1664913857} + - component: {fileID: 1664913859} + - component: {fileID: 1664913858} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1664913857 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664913856} + 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: 1876058329} + 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: 46.44001, y: -54.1} + m_SizeDelta: {x: 126.6, y: 31.45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1664913859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664913856} + m_CullTransparentMesh: 0 +--- !u!114 &1664913858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664913856} + 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: c439afb020a1e7e45a6f23ef05faa08f, 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 &1695832975 GameObject: m_ObjectHideFlags: 0 @@ -15938,6 +16109,137 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1876058328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1876058329} + - component: {fileID: 1876058333} + - component: {fileID: 1876058332} + - component: {fileID: 1876058331} + - component: {fileID: 1876058330} + m_Layer: 5 + m_Name: btnXinRen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1876058329 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876058328} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9995539, y: 0.9995539, z: 0.9995539} + m_Children: + - {fileID: 2040797619} + - {fileID: 1664913857} + - {fileID: 524877548} + m_Father: {fileID: 1012972711} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 112, y: 208.92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1876058333 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876058328} + m_CullTransparentMesh: 0 +--- !u!114 &1876058332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876058328} + 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: 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: 1876058330} + 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 &1876058331 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876058328} + 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!114 &1876058330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876058328} + 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 &1973457834 GameObject: m_ObjectHideFlags: 0 @@ -20665,7 +20967,7 @@ ParticleSystem: --- !u!199 &2023267969 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20800,6 +21102,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2040797618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2040797619} + - component: {fileID: 2040797621} + - component: {fileID: 2040797620} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2040797619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040797618} + 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: 1876058329} + 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: 47, y: 29.499928} + m_SizeDelta: {x: 160, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2040797621 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040797618} + m_CullTransparentMesh: 0 +--- !u!114 &2040797620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040797618} + 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: 9ec814afc8884984bab3b5730d3fc597, 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 &2110103214 GameObject: m_ObjectHideFlags: 0 @@ -20840,7 +21216,7 @@ RectTransform: - {fileID: 2213520785919958966} - {fileID: 2696028058082798374} m_Father: {fileID: 1012972711} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -25786,7 +26162,7 @@ ParticleSystem: --- !u!199 &53865032735354669 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30637,7 +31013,7 @@ ParticleSystem: --- !u!199 &53865032903479894 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35372,7 +35748,7 @@ ParticleSystem: --- !u!199 &53865033217178009 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39985,7 +40361,7 @@ ParticleSystem: --- !u!199 &53865033315684810 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42851,7 +43227,7 @@ MonoBehaviour: --- !u!199 &2029503781167846324 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52617,7 +52993,7 @@ ParticleSystem: --- !u!199 &6880421793403083728 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58381,7 +58757,7 @@ ParticleSystem: --- !u!199 &4461638917069206421 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63819,7 +64195,7 @@ ParticleSystem: --- !u!199 &3013323903669708406 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -68583,7 +68959,7 @@ ParticleSystem: --- !u!199 &3013323904051820469 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -73155,7 +73531,7 @@ ParticleSystem: --- !u!199 &3013323905367474027 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80633,7 +81009,7 @@ ParticleSystem: --- !u!199 &4464147961387653562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85336,7 +85712,7 @@ ParticleSystem: --- !u!199 &4464147961555461313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90219,7 +90595,7 @@ ParticleSystem: --- !u!199 &4464147961868422926 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94906,7 +95282,7 @@ ParticleSystem: --- !u!199 &4464147962235348829 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100715,7 +101091,7 @@ ParticleSystem: --- !u!199 &6988990775388982249 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -106820,7 +107196,7 @@ ParticleSystem: --- !u!199 &1454073279585546898 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -111797,7 +112173,7 @@ ParticleSystem: --- !u!199 &6133679773105218358 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -116691,7 +117067,7 @@ ParticleSystem: --- !u!199 &6133679773792227019 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -121357,7 +121733,7 @@ ParticleSystem: --- !u!199 &6133679774607836274 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -126237,7 +126613,7 @@ ParticleSystem: --- !u!199 &7281689276397397565 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -131623,7 +131999,7 @@ ParticleSystem: --- !u!199 &6542693245334262270 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -136492,7 +136868,7 @@ ParticleSystem: --- !u!199 &6542693245491611079 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -143999,7 +144375,7 @@ ParticleSystem: --- !u!199 &4325216380872068964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -146080,15 +146456,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} ---- !u!224 &830511510176938944 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - m_PrefabInstance: {fileID: 8971074634032498639} - m_PrefabAsset: {fileID: 0} --- !u!1 &1533186584701823329 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} m_PrefabInstance: {fileID: 8971074634032498639} m_PrefabAsset: {fileID: 0} +--- !u!224 &830511510176938944 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + m_PrefabInstance: {fileID: 8971074634032498639} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index df65768231..dae694c909 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -4849,6 +4849,7 @@ GameObject: - component: {fileID: 4108176206694323356} - component: {fileID: 7856299532692921519} - component: {fileID: 4135426335638540336} + - component: {fileID: 7779656916480398504} m_Layer: 5 m_Name: Stones m_TagString: Untagged @@ -4910,6 +4911,35 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 m_ChildControlHeight: 1 +--- !u!114 &7779656916480398504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3410947377148270787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &3416270479864502772 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index eb5a0e8c39..66cfcf70ce 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -32971,6 +32971,7 @@ GameObject: m_Component: - component: {fileID: 5664425003762969402} - component: {fileID: 2611804464083557781} + - component: {fileID: 530424036636603182} m_Layer: 5 m_Name: GeneralBigPopup_SelectGem m_TagString: Untagged @@ -33009,6 +33010,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7276085945121101807} m_CullTransparentMesh: 0 +--- !u!114 &530424036636603182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7276085945121101807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &7286381959021743739 GameObject: m_ObjectHideFlags: 0 @@ -36651,6 +36681,7 @@ GameObject: m_Component: - component: {fileID: 78969896755961002} - component: {fileID: 5290742308480372247} + - component: {fileID: 106850451998954397} m_Layer: 5 m_Name: GeneralBigPopup_GemCompound m_TagString: Untagged @@ -36692,6 +36723,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8510512026465178018} m_CullTransparentMesh: 0 +--- !u!114 &106850451998954397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510512026465178018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &8520562720478604777 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardGemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardGemSingleShowPopup.prefab index b42b648552..4d31bb12e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardGemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardGemSingleShowPopup.prefab @@ -2730,6 +2730,7 @@ RectTransform: m_Children: - {fileID: 5097359631411551219} - {fileID: 1926333495800632184} + - {fileID: 7772586108384234085} m_Father: {fileID: 4320698806848380767} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3318,3 +3319,78 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 +--- !u!1001 &5473152916591848272 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9127752138271226266} + m_Modifications: + - target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_Name + value: fx_zhuangbeijiemian + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6e21988006c4b0942b32c75e6b6987ba, type: 3} +--- !u!4 &7772586108384234085 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba, + type: 3} + m_PrefabInstance: {fileID: 5473152916591848272} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 7983227587..fe3e215128 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -17185,6 +17185,10 @@ MonoBehaviour: extension: .png resPathIndex: 61 resAbNameIndex: 30 + - resName: r_guanka_zinrenshangcheng_zh + extension: .png + resPathIndex: 61 + resAbNameIndex: 30 - resName: x_xb_quan_01_zh extension: .png resPathIndex: 61 @@ -19761,6 +19765,18 @@ MonoBehaviour: extension: .png resPathIndex: 88 resAbNameIndex: 46 + - resName: d_txws_biaoti + extension: .png + resPathIndex: 90 + resAbNameIndex: 46 + - resName: d_txws_bj + extension: .png + resPathIndex: 90 + resAbNameIndex: 46 + - resName: d_txws_xsjj + extension: .png + resPathIndex: 90 + resAbNameIndex: 46 - resName: jinjishilian extension: .png resPathIndex: 89 @@ -25741,6 +25757,10 @@ MonoBehaviour: extension: .png resPathIndex: 152 resAbNameIndex: 78 + - resName: y_haohuayueka + extension: .png + resPathIndex: 153 + resAbNameIndex: 78 - resName: y_yjj_128yjj001_zh extension: .png resPathIndex: 152 @@ -26273,6 +26293,18 @@ MonoBehaviour: extension: .png resPathIndex: 169 resAbNameIndex: 85 + - resName: t_tehuishangcheng_diban + extension: .png + resPathIndex: 170 + resAbNameIndex: 85 + - resName: t_tehuishangcheng_juanzhou + extension: .png + resPathIndex: 170 + resAbNameIndex: 85 + - resName: t_tehuishangcheng_mwlb + extension: .png + resPathIndex: 170 + resAbNameIndex: 85 - resName: t_tequan_henlan02 extension: .png resPathIndex: 169 @@ -26317,6 +26349,14 @@ MonoBehaviour: extension: .png resPathIndex: 169 resAbNameIndex: 85 + - resName: t_tequan_vip13 + extension: .png + resPathIndex: 170 + resAbNameIndex: 85 + - resName: t_tequan_vip14 + extension: .png + resPathIndex: 170 + resAbNameIndex: 85 - resName: t_tequan_vip2 extension: .png resPathIndex: 169 @@ -58657,6 +58697,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 697 resAbNameIndex: 3151 + - resName: JingjishiLianPatface + extension: .prefab + resPathIndex: 699 + resAbNameIndex: 3151 - resName: FindFairyPanel extension: .prefab resPathIndex: 698 @@ -78103,6 +78147,8 @@ MonoBehaviour: - lz4/bg/s_shanhe_ditu.unity3d - lz4/bg/s_shanhe_xiaoditu_beijing.unity3d - lz4/bg/s_shanhe_xiaoditu_zhezhao.unity3d + - lz4/bg/ui/findfairy/d_dhxx_biaoti_02.unity3d + - lz4/bg/ui/findfairy/d_dhxx_pailiandi.unity3d - lz4/dynamicatlas/card/t_biandui_hong.unity3d - lz4/dynamicatlas/card/t_chengyuankuang_kuang.unity3d - lz4/dynamicatlas/card/t_zhandoukuang_hong01.unity3d diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 28bd6cdec9..c853ce8a7d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1387,6 +1387,8 @@ ActivityTypeDef = { chaozhifanli = 90, chaozhifanli30 = 92, + + XinRenShop = 91, -- 新人商城 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index b9b22e6c83..1e71e61659 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -10622,7 +10622,7 @@ local passivityList = { end PassiveManager.passiveCountList[role.camp][id] = 1 local RoleVanish=function(deader) - BattleLogic.WaitForTrigger(2,function() + --BattleLogic.WaitForTrigger(2,function() if deader.camp~=role.camp then return end @@ -10648,7 +10648,7 @@ local passivityList = { rTime=rTime+1 end end) - end) + -- end) end --即使被放逐也会同样生效 BattleLogic.Event:AddEvent(BattleEventName.RoleRealDead,RoleVanish) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua index f4fdb8079b..c5d0deedc8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua @@ -55,6 +55,9 @@ function InvadeMonsterView:InitComponent(gameObject, fightPointPassMainPanel) this.btnJourneyWithWindRedPoint = Util.GetGameObject(this.btnJourneyWithWind, "redPoint") this.btnJourneyWithWindTime = Util.GetGameObject(this.btnJourneyWithWind, "time"):GetComponent("Text") Util.GetGameObject(this.btnJourneyWithWind, "info"):GetComponent("Text").text = "飘邈之旅" + -- 新人商城 + this.btnXinRen = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnXinRen") + this.btnXinRenTime = Util.GetGameObject(this.btnXinRen, "time"):GetComponent("Text") end --绑定事件（用于子类重写） @@ -117,6 +120,10 @@ function InvadeMonsterView:BindEvent() Util.AddClick(this.btnJourneyWithWind, function() UIManager.OpenPanel(UIName.JourneyWithWindPanel) end) + -- 缥缈之旅 + Util.AddClick(this.btnXinRen, function() + JumpManager.GoJump(36012) + end) end @@ -200,7 +207,7 @@ function InvadeMonsterView:AddListener() Game.GlobalEvent:AddEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.RefreshOnlineRewardShow) Game.GlobalEvent:AddEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.OnRefreshRedPoint) - Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, this.JourneyWithWindBtnAutoClose) + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, this.CheckBtnShow) end @@ -212,7 +219,7 @@ function InvadeMonsterView:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.RefreshOnlineRewardShow) Game.GlobalEvent:RemoveEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.OnRefreshRedPoint) - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, this.JourneyWithWindBtnAutoClose) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, this.CheckBtnShow) end --界面打开时调用（用于子类重写） @@ -234,14 +241,9 @@ function InvadeMonsterView:OnShow(...) else this.btnRewrdChapter:SetActive(false) end - --缥缈之旅显示判断 - local idJourneyWithWind = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.JourneyWithWind) - if idJourneyWithWind and idJourneyWithWind > 0 then - this.btnJourneyWithWind:SetActive(true) - this.RefreshJourneyWithWindShow() - else - this.btnJourneyWithWind:SetActive(false) - end + + -- 检测部分按钮显示状态 + this.CheckBtnShow() end -- 刷新在线奖励显示 @@ -391,7 +393,10 @@ function this.RefreshJourneyWithWindShow() end end end -function this.JourneyWithWindBtnAutoClose() + +-- 按钮状态检测 +function this.CheckBtnShow() + --缥缈之旅显示判断 local idJourneyWithWind = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.JourneyWithWind) if idJourneyWithWind and idJourneyWithWind > 0 then this.btnJourneyWithWind:SetActive(true) @@ -399,7 +404,48 @@ function this.JourneyWithWindBtnAutoClose() else this.btnJourneyWithWind:SetActive(false) end + + -- 新人商城显示判断 + local xrId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) + if xrId and xrId > 0 then + this.btnXinRen:SetActive(true) + this.RefreshXinRenShow() + else + this.btnXinRen:SetActive(false) + end end + + + +-- 检测在缥缈之旅状态 +function this.RefreshXinRenShow() + local endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.XinRenShop) + local timeDown = endtime - GetTimeStamp() + if this.timer3 then + this.timer3:Stop() + this.timer3 = nil + end + if timeDown > 0 then + this.btnXinRenTime.text = GetLeftTimeStrByDeltaTime2(timeDown)--string.format("剩余%s",GetLeftTimeStrByDeltaTime2(timeDown)) + this.timer3 = Timer.New(function() + this.btnXinRenTime.text = GetLeftTimeStrByDeltaTime2(timeDown)--string.format("剩余%s",GetLeftTimeStrByDeltaTime2(timeDown)) + if timeDown < 0 then + if this.btnXinRen then + this.btnXinRen:SetActive(false) + end + this.timer3:Stop() + this.timer3 = nil + end + timeDown = timeDown - 1 + end, 1, -1, true) + this.timer3:Start() + else + if this.btnXinRen then + this.btnXinRen:SetActive(false) + end + end +end + --界面关闭时调用（用于子类重写） function InvadeMonsterView:OnClose() @@ -417,6 +463,10 @@ function InvadeMonsterView:OnClose() this.timer2:Stop() this.timer2 = nil end + if this.timer3 then + this.timer3:Stop() + this.timer3 = nil + end end --界面销毁时调用（用于子类重写） diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua index 4855e41918..e09ea8228f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua @@ -2,6 +2,7 @@ GemManager = {} local this = GemManager local gemConfig = ConfigManager.GetConfig(ConfigName.GemConfig) local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) +local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) function this.Initialize() this.myGemList = {}--我穿戴命石的id this.typeGemList = {} @@ -119,10 +120,11 @@ function this.OneKeyConpound() local curMoney = BagManager.GetTotalItemNum(14)--当前金币数量 --1-8的外部循环 for i = 1, #configMap do + -- LogError("循环"..i.."================================================================") local money = this.DoCircle1(finalList,configMap[i],curMoney) + curMoney = curMoney - money totalMoney = totalMoney + money - curMoney = curMoney - totalMoney - -- LogGreen("money:"..tostring(totalMoney)) + -- LogWarn("totalMoney:"..tostring(totalMoney).." leftMongey:"..tostring(curMoney)) end local tempList = {} for key, value in pairs(finalList) do--存在数据为0的情况，剔除 @@ -139,7 +141,7 @@ function this.DoCircle1(finalList,data,money) local lastGNum = 0--上一次合成出来的数量 for i = 1, #data do local tempData = data[i] - -- LogPink("Id:"..tostring(tempData.Id).." lastGNum:"..tostring(lastGNum)) + -- LogPink("Id:"..tostring(tempData.Id).." 名字："..tostring(ItemConfig[tempData.Id].Name).." lastGNum:"..tostring(lastGNum)) --判断是否满级 if not tempData.NextGem or tempData.NextGem == 0 then if lastGNum > 0 then @@ -191,7 +193,7 @@ function this.DoCircle1(finalList,data,money) end end lastGNum = curGemNum/tempData.UpgradeNum - -- LogGreen("lastGNum:"..tostring(lastGNum)) + -- Log("lastGNum:"..tostring(lastGNum)) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index d136adfe09..9b0d2598b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -415,13 +415,14 @@ function this.GetBianshenka() end) end +-- 一键命石 function this.GetGem() local ic = ConfigManager.GetConfig(ConfigName.ItemConfig) local i = 0 coroutine.start(function() for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ItemConfig)) do if ItemType.Gem == configInfo.ItemType then - NetManager.GMEvent("1#"..configInfo.Id.."#5") + NetManager.GMEvent("1#"..configInfo.Id.."#20") coroutine.wait(0.01) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index d65835df5b..4877040784 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -175,6 +175,10 @@ function RewardEquipSingleShowPopup2:RemoveListener() end +function RewardEquipSingleShowPopup2:OnSortingOrderChange() + Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1) +end + --界面打开时调用（用于子类重写） function RewardEquipSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isShowGet,_isShowGo,_curHeroData,_position,_targetEquipData,_func) if not _equipData then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua index c95bb043ac..34da3deffc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua @@ -21,6 +21,7 @@ function RewardGemSingleShowPopup:InitComponent() this.itemView = SubUIManager.Open(SubUIConfig.ItemView,this.itemPos.transform) this.armorType = Util.GetGameObject(self.transform, "bg/topBar/armor/info/armorType"):GetComponent("Text") this.armorLanTuNum = Util.GetGameObject(self.transform, "bg/topBar/armor/info/armorLanTuNum"):GetComponent("Text") + this.effectbaijin = Util.GetGameObject(self.topBar, "fx_zhuangbeijiemian") this.info = Util.GetGameObject(self.transform, "bg/topBar/armor/info") this.itemName = Util.GetGameObject(this.info, "name"):GetComponent("Text") @@ -63,6 +64,7 @@ function RewardGemSingleShowPopup:BindEvent() end) Util.AddClick(this.btnUse, function()--使用跳转 JumpManager.GoJump(40056) + self:ClosePanel() end) Util.AddClick(this.btnClose, function()--替换，穿戴 UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.SelectGem,this.gemType,this.position,function () @@ -105,6 +107,10 @@ function RewardGemSingleShowPopup:RemoveListener() end +function RewardGemSingleShowPopup:OnSortingOrderChange() + Util.SetParticleSortLayer(this.effectbaijin,self.sortingOrder + 1) +end + --界面打开时调用（用于子类重写） function RewardGemSingleShowPopup:OnOpen(...) local data = { ... } @@ -184,6 +190,8 @@ function RewardGemSingleShowPopup:OnShow() this.armorLanTuNum.gameObject:SetActive(this.openType ~= 2) this.armorType.text = this.getType()--道具类型显示 this.armorInfoText.text = string.gsub(GetLanguageStrById(itemConfigData.ItemDescribe), "\\n", "") + this.effectbaijin:SetActive(itemConfigData.Quantity1==7) + Util.SetParticleSortLayer(this.effectbaijin,self.sortingOrder + 1) local jumpDataList = itemConfigData.Jump local jumpSortData = creatJumpData(jumpDataList) for i = 1, #jumpSortData do @@ -219,7 +227,7 @@ function this.RedPointCheck() end end for key, value in pairs(redPointData) do--红点检测合成 - if numInBag + 1 > gemConfig[itemSid].UpgradeNum and gemConfig[itemSid].NextGem > 0 then + if numInBag + 1 >= gemConfig[itemSid].UpgradeNum and gemConfig[itemSid].NextGem > 0 then this.jumpRed:SetActive(true) break end diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index 3d747e3bef..7e0195fae6 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -331,6 +331,9 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder) self.fx_linglongbaojing_long.gameObject:SetActive(true) SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_lianhuaxiazhui_003) end,0.5):Start() + + local act = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.linglongshangshi) + self.shopBtn:SetActive(not not act) end function LingLongBaoJingPanel:SetLayer() diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index c3685b9a1f..ace8d64ed0 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -398,6 +398,11 @@ function ItemView:GetRewardShow(_itemData, effectLayer) UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, _itemData.backData.itemId, nil) end) elseif _itemData.ItemType == ItemType.Gem then + if effectLayer > 0 and _itemData.configData.Quantity1 then + self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4) + self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6) + self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7) + end Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3) end)