diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_gongmingwanchengzi.png b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_gongmingwanchengzi.png similarity index 100% rename from Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_gongmingwanchengzi.png rename to Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_gongmingwanchengzi.png diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_gongmingwanchengzi.png.meta b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_gongmingwanchengzi.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_gongmingwanchengzi.png.meta rename to Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_gongmingwanchengzi.png.meta diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png new file mode 100644 index 0000000000..3fc80338ff Binary files /dev/null and b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png differ diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png.meta b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png.meta new file mode 100644 index 0000000000..4918a3f888 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ac0fe000742e6e7459fcff94fa9c97ee +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 985a2206d4526ad48abdf16b2a376da8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HongMengZhenAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png new file mode 100644 index 0000000000..2bb0c574c4 Binary files /dev/null and b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png differ diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png.meta b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png.meta new file mode 100644 index 0000000000..7f8c6dc219 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c046dc80bbbcde94591c38d067db5e1f +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4197e6bac4bb21d4f925f131180efdd1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HongMengZhenAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 7bc09409d2..7aa912bc85 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -108,7 +108,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.8, y: -2.1} + m_AnchoredPosition: {x: 1.800003, y: -2.100006} m_SizeDelta: {x: 87.6, y: 180.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222210643621885542 @@ -22625,6 +22625,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &649877119902269376 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2042786427835682893} + - component: {fileID: 8653565348717953195} + - component: {fileID: 6702407946088808337} + m_Layer: 5 + m_Name: HongMenging + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2042786427835682893 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649877119902269376} + 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: 8519482306180324338} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8653565348717953195 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649877119902269376} + m_CullTransparentMesh: 0 +--- !u!114 &6702407946088808337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649877119902269376} + 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: 2ecaf3be54bafc741b8cbd28c39251f2, 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 &650337737194755960 GameObject: m_ObjectHideFlags: 0 @@ -27323,6 +27397,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &835542004825070454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4576266180444891320} + - component: {fileID: 1969607538578195497} + - component: {fileID: 6701566685627942036} + m_Layer: 5 + m_Name: HongMenging + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4576266180444891320 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835542004825070454} + 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: 8520111332518550340} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.0000048876, y: 0.000078082} + m_SizeDelta: {x: 133.92, y: 133.92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1969607538578195497 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835542004825070454} + m_CullTransparentMesh: 0 +--- !u!114 &6701566685627942036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835542004825070454} + 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: 2ecaf3be54bafc741b8cbd28c39251f2, 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 &855235240542742568 GameObject: m_ObjectHideFlags: 0 @@ -56634,6 +56782,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2567516015316497473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8653427146088204876} + - component: {fileID: 1365096350331733766} + - component: {fileID: 2653670844991576174} + m_Layer: 5 + m_Name: HongMenging + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8653427146088204876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567516015316497473} + 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: 6689222768565101352} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1365096350331733766 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567516015316497473} + m_CullTransparentMesh: 0 +--- !u!114 &2653670844991576174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567516015316497473} + 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: 2ecaf3be54bafc741b8cbd28c39251f2, 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 &2632078546706603429 GameObject: m_ObjectHideFlags: 0 @@ -105361,6 +105583,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5264594473631535422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3041852622851857225} + - component: {fileID: 2436641649722021518} + - component: {fileID: 3789435288360756249} + m_Layer: 5 + m_Name: HongMenging + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3041852622851857225 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5264594473631535422} + 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: 8520182284259224778} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2436641649722021518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5264594473631535422} + m_CullTransparentMesh: 0 +--- !u!114 &3789435288360756249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5264594473631535422} + 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: 2ecaf3be54bafc741b8cbd28c39251f2, 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 &5364604360836469863 GameObject: m_ObjectHideFlags: 0 @@ -110584,6 +110880,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5983211258057956019} m_CullTransparentMesh: 0 +--- !u!1 &6039938112086647440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5083072329690712550} + - component: {fileID: 42807912760440624} + - component: {fileID: 8226414317878818214} + m_Layer: 5 + m_Name: HongMenging + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5083072329690712550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6039938112086647440} + 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: 8520117792584050498} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &42807912760440624 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6039938112086647440} + m_CullTransparentMesh: 0 +--- !u!114 &8226414317878818214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6039938112086647440} + 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: 2ecaf3be54bafc741b8cbd28c39251f2, 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 &6100785257906580120 GameObject: m_ObjectHideFlags: 0 @@ -134570,6 +134940,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &6896499049963337095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2464724230327973097} + - component: {fileID: 897725986985479939} + - component: {fileID: 6805194309917788016} + m_Layer: 5 + m_Name: HongMenging + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2464724230327973097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6896499049963337095} + 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: 8519697061298595646} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.00061893, y: 0.000020683} + m_SizeDelta: {x: 133.92, y: 133.92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &897725986985479939 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6896499049963337095} + m_CullTransparentMesh: 0 +--- !u!114 &6805194309917788016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6896499049963337095} + 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: 2ecaf3be54bafc741b8cbd28c39251f2, 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 &6902611998727661850 GameObject: m_ObjectHideFlags: 0 @@ -134750,6 +135194,7 @@ RectTransform: m_Children: - {fileID: 8520469575685594424} - {fileID: 7008673267199892489} + - {fileID: 8653427146088204876} m_Father: {fileID: 224950323983480262} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -187849,6 +188294,7 @@ RectTransform: - {fileID: 3186279549825186737} - {fileID: 4494805040267940149} - {fileID: 7892719658203971873} + - {fileID: 4576266180444891320} m_Father: {fileID: 224461338842806296} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -188311,6 +188757,7 @@ RectTransform: - {fileID: 7361097531623832304} - {fileID: 5954589829577688489} - {fileID: 6879932971547156798} + - {fileID: 2464724230327973097} m_Father: {fileID: 224737750581944100} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -188504,6 +188951,7 @@ RectTransform: m_Children: - {fileID: 8520410624325708336} - {fileID: 1325944382262153422} + - {fileID: 3041852622851857225} m_Father: {fileID: 224252541779665038} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -188939,6 +189387,7 @@ RectTransform: m_Children: - {fileID: 8519992672161754356} - {fileID: 4836639383554338010} + - {fileID: 5083072329690712550} m_Father: {fileID: 224346343574370934} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -189089,6 +189538,7 @@ RectTransform: m_Children: - {fileID: 8520243428257119870} - {fileID: 5065906932313395558} + - {fileID: 2042786427835682893} m_Father: {fileID: 224292030102175808} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c6633f5680..a9af6aa25f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1305,7 +1305,7 @@ FUNCTION_OPEN_TYPE = { POKEMON=79,--灵兽山 XiaoYaoYou = 80, -- 逍遥游 RoleAwake = 81, -- 神将觉醒 - HongMengZhen = 83, -- 鸿蒙阵 + HongMengZhen = 86, -- 鸿蒙阵 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index cc9106bc3a..a37e02f18d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -33,7 +33,7 @@ function this:InitHongMengData(hongmengGuards, hongmengHeroInfos, hongmengTablet this.hongmengGuards = hongmengGuards --LogGreen(#this.hongmengGuards) this.hongmengHeroInfos = hongmengHeroInfos - --LogGreen(#this.hongmengHeroInfos) + LogGreen(#this.hongmengHeroInfos) for i = 1, #this.hongmengGuards do this.hongmengGuards[i].time = this.hongmengGuards[i].time + GetTimeStamp() end @@ -331,17 +331,18 @@ function this.GetSingleAdditions(type) return 0 end -function this:GetHongMengUpData() +function this.GetHongMengUpData() for key, value in ConfigPairs(HongmengUp) do -- body if value.HongmengLevel == this.hongmengTablet+1 then -- body + return ConfigManager.TryGetConfigData(ConfigName.HongmengUp,key) end end - + return nil end --鸿蒙共享装备临时数据 @@ -477,9 +478,13 @@ end function this.RefreshOpenBoxPoint() - this.tab = ConfigManager.GetConfig(ConfigName.Hongmeng) + local tab = ConfigManager.GetConfig(ConfigName.Hongmeng) local money = BagManager.GetTotalItemNum(UpViewRechargeType.Gold) - if money > this.tab[#this.hongmengHeroInfos].PropPrice[2] or money > this.tab[#this.hongmengHeroInfos].MoneyPrice[2] then + if #this.hongmengHeroInfos<=0 then + -- body + return false + end + if money > tab[#this.hongmengHeroInfos].PropPrice[2] or money > tab[#this.hongmengHeroInfos].MoneyPrice[2] then return true else return false @@ -505,9 +510,10 @@ function this.RefreshUpTowerPoint() -- body return false else - local data = this:GetHongMengUpData() - --print(data.LevelUp[1][2].." "..data.LevelUp[2][2]) - if BagManager.GetTotalItemNum(UpViewRechargeType.Gold) >= data.LevelUp[1][2] then + local data = this.GetHongMengUpData() + -- LogGreen(data.LevelUp[1][2].." "..data.LevelUp[2][2]) + -- LogYellow(BagManager.GetTotalItemNum(UpViewRechargeType.Gold)) + if data and BagManager.GetTotalItemNum(UpViewRechargeType.Gold) >= data.LevelUp[1][2] then -- body if BagManager.GetTotalItemNum(UpViewRechargeType.GrowthAmulet) >= data.LevelUp[2][2] then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index fd6490aef2..7cb67d1bdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -283,7 +283,7 @@ function this:InitComponent() -- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:AddFuncItem(this.btnWaiDi, 0), [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换 [FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, -1200),--神将合成、置换 - --[FUNCTION_OPEN_TYPE.HongMengZhen] = this:AddFuncItem(this.btnHongMeng,0) -- 鸿蒙阵 + } this.operateNewText = { @@ -305,7 +305,7 @@ function this:InitComponent() -- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:InsertNewText(this.btnWaiDi), [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompoundHero),--神将合成、置换 [FUNCTION_OPEN_TYPE.POKEMON] = this:InsertNewText(this.btnPokemon),--神将合成、置换 - --[FUNCTION_OPEN_TYPE.HongMengZhen] = this:InsertNewText(this.btnHongMeng) -- 鸿蒙阵 + } -- 红点 @@ -405,7 +405,7 @@ function this:InitComponent() this.btnFunHide[FUNCTION_OPEN_TYPE.EMAIL] = this.btnYouJian this.btnFunHide[FUNCTION_OPEN_TYPE.GOODFRIEND] = this.btnFriend this.btnFunHide[FUNCTION_OPEN_TYPE.ALLRANKING] = this.btnRank - --this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng + this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng --this.btnFunGray[FUNCTION_OPEN_TYPE.NORMALCARBON] = this.btnFuBen --this.btnFunGray[FUNCTION_OPEN_TYPE.MONSTER_COMING] = this.btnMonster --this.btnFunGray[FUNCTION_OPEN_TYPE.ADVENTURE] = this.btnMijing diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua index 459c551f79..92be07ecc7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua @@ -14,12 +14,18 @@ function RoleChooseListPanel:InitComponent() this.BtnBack = Util.GetGameObject(self.transform, "btnBack") this.BtnSure = Util.GetGameObject(self.transform, "btnSure") + this.BtnSure:SetActive(false) this.btnAutoSelect = Util.GetGameObject(self.transform, "btnAutoSelect") + this.btnAutoSelect:SetActive(false) this.cardPre = Util.GetGameObject(self.gameObject, "item") + this.btnYes = Util.GetGameObject(self.gameObject,"btnYes") + this.btnYes:SetActive(true) --this.grid = Util.GetGameObject(self.gameObject, "scroll/grid") + this.title_text = Util.GetGameObject(self.gameObject,"bg/Text"):GetComponent("Text") + this.desText = Util.GetGameObject(self.gameObject, "desText"):GetComponent("Text") this.numText = Util.GetGameObject(self.gameObject, "numText"):GetComponent("Text") - + local v = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect this.Scrollbar= Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") @@ -49,7 +55,7 @@ function RoleChooseListPanel:BindEvent() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) self:ClosePanel() end) - Util.AddClick(this.BtnSure, function() + Util.AddClick(this.btnYes, function() if TempData ==nil then -- body PopupTipPanel.ShowTip("请先选择一个英雄" ) @@ -111,6 +117,9 @@ end --界面打开时调用(用于子类重写) function RoleChooseListPanel:OnOpen(flag) + this.desText.text = "" + this.numText.text = "" + this.title_text.text ="共鸣神将选择" self.flag = flag self.ScrollView:SetData(HarmonyManager.ChooseDataList,function (index, go) @@ -169,7 +178,7 @@ function this.OnShowSingleCardData(go,heroData,index)--isSelect 1选择 2 没 SelectHero = choosed selectIndex = index SelectHero:SetActive(true) - this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum) + --this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum) end) Util.AddOnceClick(formationMask, function()