From f744e609a1607695bef6a53d0dde10ff89f42ebe Mon Sep 17 00:00:00 2001 From: guowei Date: Fri, 18 Dec 2020 16:31:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E5=9B=BE=E7=89=87=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../h_hongmengzheng_gongmingwanchengzi.png | Bin ..._hongmengzheng_gongmingwanchengzi.png.meta | 0 .../ArtFont/h_hongmengzheng_hongmeng01.png | Bin 0 -> 12293 bytes .../h_hongmengzheng_hongmeng01.png.meta | 88 ++++ .../ArtFont/h_hongmengzheng_hongmeng02.png | Bin 0 -> 12464 bytes .../h_hongmengzheng_hongmeng02.png.meta | 88 ++++ .../Prefabs/UI/RoleInfo/RoleEquipPanel.prefab | 452 +++++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 2 +- .../Harmony/Manager/HarmonyManager.lua | 22 +- .../~Lua/Modules/Main/MainPanel.lua | 6 +- .../Modules/RoleInfo/RoleChooseListPanel.lua | 15 +- 11 files changed, 657 insertions(+), 16 deletions(-) rename Assets/ManagedResources/Atlas/HongMengZhenAtlas/{ => ArtFont}/h_hongmengzheng_gongmingwanchengzi.png (100%) rename Assets/ManagedResources/Atlas/HongMengZhenAtlas/{ => ArtFont}/h_hongmengzheng_gongmingwanchengzi.png.meta (100%) create mode 100644 Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png create mode 100644 Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng01.png.meta create mode 100644 Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png create mode 100644 Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengzheng_hongmeng02.png.meta 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 0000000000000000000000000000000000000000..3fc80338ffb2c2e99ea0e920f655ce063c2bb0a3 GIT binary patch literal 12293 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 literal 0 HcmV?d00001 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()