diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_11.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_11.png index ceec8ed5ac..219e1436a4 100644 Binary files a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_11.png and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_11.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_shanheshejitu_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_shanheshejitu_zh.png.meta index e383e5272c..15fb39cb3b 100644 --- a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_shanheshejitu_zh.png.meta +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_shanheshejitu_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: [] diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xiuxing_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xiuxing_zh.png.meta index 60b7de5a98..2f2a2b6824 100644 --- a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xiuxing_zh.png.meta +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xiuxing_zh.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: [] diff --git a/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon1_zh.png b/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon1_zh.png index e34c1f40a5..f35d24894e 100644 Binary files a/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon1_zh.png and b/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon2_zh.png b/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon2_zh.png index 08200ec3c7..f850fd7435 100644 Binary files a/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon2_zh.png and b/Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont/n_niuqichongchong_icon2_zh.png differ diff --git a/Assets/ManagedResources/Icon/FaBao/r_fb_90053.png b/Assets/ManagedResources/Icon/FaBao/r_fb_90053.png new file mode 100644 index 0000000000..f21394cf3a Binary files /dev/null and b/Assets/ManagedResources/Icon/FaBao/r_fb_90053.png differ diff --git a/Assets/ManagedResources/Icon/FaBao/r_fb_90053.png.meta b/Assets/ManagedResources/Icon/FaBao/r_fb_90053.png.meta new file mode 100644 index 0000000000..664d5c1fca --- /dev/null +++ b/Assets/ManagedResources/Icon/FaBao/r_fb_90053.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: e60b5434c52b39a44b87d8380db4e99a +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: -1 + 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: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 51eb9917bc062c048af5fe0f32f1c384 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/FaBao/r_fb_90054.png b/Assets/ManagedResources/Icon/FaBao/r_fb_90054.png new file mode 100644 index 0000000000..82e73c50f2 Binary files /dev/null and b/Assets/ManagedResources/Icon/FaBao/r_fb_90054.png differ diff --git a/Assets/ManagedResources/Icon/FaBao/r_fb_90054.png.meta b/Assets/ManagedResources/Icon/FaBao/r_fb_90054.png.meta new file mode 100644 index 0000000000..bc335f6dca --- /dev/null +++ b/Assets/ManagedResources/Icon/FaBao/r_fb_90054.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2089feb0ed3ce114d8f15d8e8f571d58 +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: -1 + 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: ea59f6e5a77af844485f8c4679a081c7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Hero/c_0043_t1.png b/Assets/ManagedResources/Icon/Hero/c_0043_t1.png index 94e646ba2f..846dae1391 100644 Binary files a/Assets/ManagedResources/Icon/Hero/c_0043_t1.png and b/Assets/ManagedResources/Icon/Hero/c_0043_t1.png differ diff --git a/Assets/ManagedResources/Icon/Hero/c_0043_t3.png b/Assets/ManagedResources/Icon/Hero/c_0043_t3.png index 54e937766e..da8511cc7b 100644 Binary files a/Assets/ManagedResources/Icon/Hero/c_0043_t3.png and b/Assets/ManagedResources/Icon/Hero/c_0043_t3.png differ diff --git a/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0032.png b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0032.png new file mode 100644 index 0000000000..72eac06afb Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0032.png differ diff --git a/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0032.png.meta b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0032.png.meta new file mode 100644 index 0000000000..383bcf28ac --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0032.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 1060f87894956ed4f94d2cfcc3f673e8 +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: -1 + 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: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bafc6ab543a5d1f4db8c49cdc7b76876 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index e055408c68..61ac409e91 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -223,7 +223,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 530, y: 90} m_Pivot: {x: 0.5, y: 0} --- !u!114 &543123651 MonoBehaviour: @@ -485,7 +485,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -20, y: 180} - m_SizeDelta: {x: 132, y: 0} + m_SizeDelta: {x: 132, y: 335.19998} m_Pivot: {x: 1, y: 0} --- !u!114 &1530677022 MonoBehaviour: @@ -1179,6 +1179,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 802282423332612291} + - {fileID: 2958034176624148787} m_Father: {fileID: 224787418950452670} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6140,7 +6141,7 @@ ParticleSystem: --- !u!199 &199678057150230830 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10790,7 +10791,7 @@ ParticleSystem: --- !u!199 &199183534652431558 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10961,7 +10962,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -221.5, y: 0} - m_SizeDelta: {x: 0, y: 86} + m_SizeDelta: {x: 435, y: 86} m_Pivot: {x: 0, y: 0.5} --- !u!222 &222488350717616978 CanvasRenderer: @@ -11793,10 +11794,10 @@ RectTransform: m_Father: {fileID: 224177140946270978} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 9, y: 0} - m_SizeDelta: {x: 0, y: 86} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 315, y: 86} m_Pivot: {x: 0, y: 1} --- !u!222 &1371611014670686407 CanvasRenderer: @@ -12104,7 +12105,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -17253,7 +17254,7 @@ ParticleSystem: --- !u!199 &5322675852388844486 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22206,7 +22207,7 @@ ParticleSystem: --- !u!199 &4894120905098160247 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22824,6 +22825,124 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2302167525964796936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2958034176624148787} + - component: {fileID: 4852086384894688426} + - component: {fileID: 5622488370196147144} + - component: {fileID: 6376354419209856582} + m_Layer: 5 + m_Name: btnShop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2958034176624148787 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2302167525964796936} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 781307181327370615} + m_Father: {fileID: 224963046119617888} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -205.02} + m_SizeDelta: {x: 127, y: 135} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4852086384894688426 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2302167525964796936} + m_CullTransparentMesh: 0 +--- !u!114 &5622488370196147144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2302167525964796936} + 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: 60d33d082cec7074180e3742c2428e67, 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!114 &6376354419209856582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2302167525964796936} + 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: 1 + 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: 5107731831691548627} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2383564431958861068 GameObject: m_ObjectHideFlags: 0 @@ -22856,8 +22975,8 @@ RectTransform: m_Father: {fileID: 2574529201874018074} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2, y: -20} m_Pivot: {x: 0.5, y: 0.5} @@ -27645,7 +27764,7 @@ ParticleSystem: --- !u!199 &8823971680245043867 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28077,9 +28196,9 @@ RectTransform: m_Father: {fileID: 224963046119617888} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -63} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2746532898759778030 @@ -32800,7 +32919,7 @@ ParticleSystem: --- !u!199 &8430471708784069297 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37901,7 +38020,7 @@ ParticleSystem: --- !u!199 &2382551773405935352 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42781,7 +42900,7 @@ ParticleSystem: --- !u!199 &7962120996366852011 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48034,7 +48153,7 @@ ParticleSystem: --- !u!199 &2541572793355743759 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48870,7 +48989,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -53524,7 +53643,7 @@ ParticleSystem: --- !u!199 &3827168092298310546 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58259,7 +58378,7 @@ ParticleSystem: --- !u!199 &3827342338386557868 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59477,9 +59596,9 @@ RectTransform: m_Father: {fileID: 1530677021} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 66, y: -64} m_SizeDelta: {x: 127, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3776263709751302196 @@ -59613,7 +59732,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -64548,7 +64667,7 @@ ParticleSystem: --- !u!199 &1560116421555167131 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64719,7 +64838,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 78} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 288, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1025382664160607553 CanvasRenderer: @@ -64829,10 +64948,10 @@ RectTransform: m_Father: {fileID: 543123650} m_RootOrder: 0 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40, y: -80} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0} --- !u!222 &7391316544598460858 CanvasRenderer: @@ -69861,7 +69980,7 @@ ParticleSystem: --- !u!199 &6019895091589445860 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74617,7 +74736,7 @@ ParticleSystem: --- !u!199 &6020120546775422180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79315,7 +79434,7 @@ ParticleSystem: --- !u!199 &6020477104265238278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -84049,7 +84168,7 @@ ParticleSystem: --- !u!199 &6019664593993108532 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88697,7 +88816,7 @@ ParticleSystem: --- !u!199 &6019812380086944594 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93540,7 +93659,7 @@ ParticleSystem: --- !u!199 &6020516516549488322 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98305,7 +98424,7 @@ ParticleSystem: --- !u!199 &6019339336154760656 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99416,10 +99535,10 @@ RectTransform: m_Father: {fileID: 450262287389847687} m_RootOrder: 0 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: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 144, y: -40} + m_SizeDelta: {x: 188, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &985655434353605601 CanvasRenderer: @@ -104449,7 +104568,7 @@ ParticleSystem: --- !u!199 &4720626719302079074 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -104718,6 +104837,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6932253673275549721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 781307181327370615} + - component: {fileID: 2986784080618895836} + - component: {fileID: 5107731831691548627} + m_Layer: 5 + m_Name: btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &781307181327370615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932253673275549721} + 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: 2958034176624148787} + 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: 4.3, y: 4.7} + m_SizeDelta: {x: 142, y: 141.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2986784080618895836 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932253673275549721} + m_CullTransparentMesh: 0 +--- !u!114 &5107731831691548627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932253673275549721} + 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: 0} + 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 &6965781046167578282 GameObject: m_ObjectHideFlags: 0 @@ -109582,7 +109775,7 @@ ParticleSystem: --- !u!199 &5535316913343579795 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -111512,9 +111705,9 @@ RectTransform: m_Father: {fileID: 1530677021} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 66, y: -212.2} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4556992764502876251 @@ -116346,7 +116539,7 @@ ParticleSystem: --- !u!199 &629998129000523010 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Spine/c_0043/c_0043.skel.bytes b/Assets/ManagedResources/Spine/c_0043/c_0043.skel.bytes index c44e10b851..095dfcfae2 100644 Binary files a/Assets/ManagedResources/Spine/c_0043/c_0043.skel.bytes and b/Assets/ManagedResources/Spine/c_0043/c_0043.skel.bytes differ diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 87e64d443f..f166d59b9f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1039,6 +1039,13 @@ JumpType = { XinJiangLaiXiShangDian = 20200, --社稷大典商店 XingChenShangDian = 20059, --星辰商店 } + +NPCPosType={ + maincity=1, + + +} + YaoHunFrame = { --[6] = "r_tongyong_yaohunkuang002", --[7] = "r_tongyong_yaohunkuang001", diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index 613504aca6..a8e12ec27e 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -61,5 +61,5 @@ end function PackageManager.UnloadVideo() Log("卸载视频:"..tostring(this.config.VideoName)) - resMgr:LoadAsset(this.config.VideoName) + resMgr:UnLoadAsset(this.config.VideoName) end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua index 32e218f047..aa250eea88 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua @@ -89,7 +89,7 @@ function FightSmallChoosePanel:OnShow() if self.liveNode then self.liveNode:OnClose() end - self.liveNode = PlayerLiveView:New(Util.GetGameObject(self.selectMap, "pos"),1) + self.liveNode = PlayerLiveView:New(Util.GetGameObject(self.selectMap, "pos"),self.sortingOrder) self.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale4,Vector3.New(0,40,0)) if FightPointPassManager.GetRoleDirection()==1 then self.liveNode:SetWalkDir(WALK_DIR.RUN_LEFT) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 2c58a4025c..cfa66e9b51 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -29,7 +29,7 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) Util.GetGameObject(instance.leader, "name/text"):SetActive(true) Util.GetGameObject(instance.leader, "name/text2"):SetActive(false) _sex = NameManager.roleSex - instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil,sortingOrder) + instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil,sortingOrder,NPCPosType.maincity) if PlayerManager.GetPlayerRide() > 0 then Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,239.9,0) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 6c5159e089..4dd4b27d6f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -27,7 +27,6 @@ function this:InitComponent() this.leftUp = Util.GetGameObject(self.gameObject, "leftUp") this.leftDown = Util.GetGameObject(self.gameObject, "leftDown") this.fireRoot = Util.GetGameObject(self.gameObject, "fireRoot") - this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn") this.leftCenter = Util.GetGameObject(self.gameObject, "leftCenter") this.btnRank = Util.GetGameObject(this.leftCenter,"btnRank") @@ -37,6 +36,9 @@ function this:InitComponent() this.rightUp = Util.GetGameObject(self.gameObject, "rightUp") this.btnSetting = Util.GetGameObject(this.rightUp,"btnSetting") this.btnSetting.gameObject:SetActive(true) + this.btnRightUpShop = Util.GetGameObject(this.rightUp,"btnShop") + this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn") + this.helpPos = this.helpBtn:GetComponent("RectTransform").localPosition this.rightDown = Util.GetGameObject(self.gameObject, "rightDown") this.btnAchive = Util.GetGameObject(this.rightDown,"btnAchive") @@ -156,6 +158,20 @@ function this:BindEvent() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.WuJinSetting) end end) + Util.AddClick(this.btnRightUpShop,function() + JumpManager.GoJump(760001) + end) + Util.AddClick(this.helpBtn, function() + if ctrlView.GetCallListCount() > 1 then + PopupTipPanel.ShowTip(Language[11259]) + return + end + if CarbonManager.carbonType == CARBON_TYPE.TRIAL then + UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y) + else + UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EndLessMap,this.helpPos.x,this.helpPos.y) + end + end) --missionView.BindEvent() trialPanel:BindEvent() endLessMapView:BindEvent() @@ -247,8 +263,9 @@ end function this:SetActiveGameObj() local isShow = MapManager.curCarbonType == CarBonTypeId.TRIAL LogGreen("MapManager.curCarbonType:"..MapManager.curCarbonType) - this.helpBtn.gameObject:SetActive(isShow) + this.helpBtn.gameObject:SetActive(true) this.leftUp.gameObject:SetActive(isShow) + this.btnRightUpShop.gameObject:SetActive(not isShow) this.btnRank.gameObject:SetActive(isShow) this.btnReward.gameObject:SetActive(isShow) this.shiQi.gameObject:SetActive(not isShow) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index b84dc1bea7..1945df5a52 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -62,8 +62,8 @@ function TrialMapPanel:InitComponent(root, mapPanel) this.s_pre=Util.GetGameObject(this.selectHero,"pre") this.upView = SubUIManager.Open(SubUIConfig.UpView, root.transform, { showType = UpViewOpenType.ShowLeft }) - this.helpBtn=Util.GetGameObject(root,"helpBtn") - this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition + -- this.helpBtn=Util.GetGameObject(root,"helpBtn") + -- this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition --boss召唤特效 this.bossEffect = Util.GetGameObject(root, "UI_effect_shilian_tab") this.energyRoot = Util.GetGameObject(root, "stepROot") @@ -121,13 +121,13 @@ function TrialMapPanel:BindEvent() end) --帮助按钮 - Util.AddClick(this.helpBtn,function() - if ctrlView.GetCallListCount() > 1 then - PopupTipPanel.ShowTip(Language[11259]) - return - end - UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y) - end) + -- Util.AddClick(this.helpBtn,function() + -- if ctrlView.GetCallListCount() > 1 then + -- PopupTipPanel.ShowTip(Language[11259]) + -- return + -- end + -- UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y) + -- end) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua index fbc7079e2e..d5e8a9bea2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua @@ -145,6 +145,7 @@ function this.InitRolePre(u, v) Util.GetTransform(this.leader, "root/ui/nemeDi").gameObject:SetActive(false) this.NpcGO = PlayerLiveView:New(Util.GetTransform(this.leader, "root/ui/roleRoot"),1) this.NpcGO:OnOpen(GetPlayerRoleSingleConFig().Scale9,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT) + this.NpcGO:RemoveTitleCanvas() end function this.RefreshOption() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 1f3f1628f2..4b0b027e56 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -203,11 +203,11 @@ function this.RefreshPlayerInfo(data) if not _PlayerHead then _PlayerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.memHead.transform) end - if titleLive then - poolManager:UnLoadAsset(titleLiveStr, titleLive, PoolManager.AssetType.GameObject) - titleLive = nil - titleLiveStr = nil - end + -- if titleLive then + -- poolManager:UnLoadAsset(titleLiveStr, titleLive, PoolManager.AssetType.GameObject) + -- titleLive = nil + -- titleLiveStr = nil + -- end _PlayerHead:Reset() _PlayerHead:SetScale(Vector3.one * 0.85) _PlayerHead:SetHead(data.head) @@ -218,18 +218,25 @@ function this.RefreshPlayerInfo(data) local title=data.userTitle if title and title>0 then this.titlePar:SetActive(true) - local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,title) - local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) - titleLiveStr = curArtResourcesConfig.Name - titleLive = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject) - titleLive.transform:SetParent(this.titlePar.transform) - titleLive.transform.localPosition = Vector3.New(0,0,0) - titleLive.transform.localScale = Vector3.New(0.5,0.5,0.5) - local sortingorder=0 - if this.sortingOrder then - Util.AddParticleSortLayer(titleLive,this.sortingOrder - sortingorder) - sortingorder = this.sortingOrder + -- local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,title) + -- local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) + -- titleLiveStr = curArtResourcesConfig.Name + -- titleLive = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject) + -- titleLive.transform:SetParent(this.titlePar.transform) + -- titleLive.transform.localPosition = Vector3.New(0,0,0) + -- titleLive.transform.localScale = Vector3.New(0.5,0.5,0.5) + -- local sortingorder=0 + -- if this.sortingOrder then + -- Util.AddParticleSortLayer(titleLive,this.sortingOrder - sortingorder) + -- sortingorder = this.sortingOrder + -- end + LogError("title=="..title) + if not titleLive then + titleLive = SubUIManager.Open(SubUIConfig.PlayerTitle, this.titlePar.transform) + titleLive:SetShow(title, Vector3.New(0,0,0), 0.5, 0.03*20, this.sortingOrder) end + + else this.titlePar:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 3690389581..aae0804143 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -7,7 +7,7 @@ local mapNpcOp = "PlayerLiveView" -- designation = 80010 -- } -function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer) +function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer,posType) -- Type = _Type -- local b = {} -- b.gameObject = gameObject @@ -39,7 +39,7 @@ function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer) instance.playerLiveGo = Util.GetGameObject(instance.leader, "liveParent/playerLive") instance.titleLiveGo = Util.GetGameObject(instance.leader, "liveParent/titleLive") instance.nameHeight=0 - + instance.posType=posType --立绘对象 instance.rideLive = nil instance.playerLive = nil @@ -83,22 +83,28 @@ end --界面打开时调用(用于子类重写) function PlayerLiveView:OnOpen(scale,pos,dir) - self:OnShowLive() if scale then self.leader.transform.localScale = Vector3.New(scale,scale,scale) end if pos then self.leader.transform.localPosition = pos end + self:OnShowLive() if dir then self:SetWalkDir(dir) end end local sortingorder=0 -function PlayerLiveView:OnSortingOrderChange(sortingOrder) +function PlayerLiveView:OnSortingOrderChange(sortingOrder1) + sortingorder=sortingOrder1 if self.titleLive then - self.titleLive:SetLayer(sortingOrder) + self.titleLive:SetLayer(sortingOrder1) + end +end +function PlayerLiveView:RemoveTitleCanvas() + if self.titleLive then + self.titleLive:RemoveCanvas() end end @@ -164,7 +170,15 @@ function PlayerLiveView:OnShowLive() y=y+3 end local curLocalPosition = Vector3.New(curArtResourcesConfig.Position[1],y,0) - self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale* self.transform.localScale.x, self.orginLayer) + LogError("scale=="..curArtResourcesConfig.Scale.." transform scale=="..self.leader.transform.localScale.x) + -- curArtResourcesConfig.Scale* self.transform.localScale.x + local effect=0 + if self.posType==NPCPosType.maincity then + effect=self.transform.localScale.x + else + effect=self.leader.transform.localScale.x + end + self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale*effect,self.orginLayer) end end function PlayerLiveView:SetNameHeight(hei) diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua index eb0e343860..1df9f52e2b 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -38,6 +38,14 @@ function PlayerTitle:OnOpen(itemId, position, scale, layer) end end +-- 删除当前canvas脚本 +function PlayerTitle:RemoveCanvas() + if self.canvas then + destroy(self.canvas) + end + self.canvas = nil +end + function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer) self:ClearTitle() @@ -45,7 +53,7 @@ function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer) local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) self.curTitleName = curArtResourcesConfig.Name self.titleLive = poolManager:LoadAsset(self.curTitleName, PoolManager.AssetType.GameObject) - self.titleLive.transform:SetParent(self.canvas.transform) + self.titleLive.transform:SetParent(self.transform) if position then self:SetPostion(position) diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua index 4b91969f9d..f909659a47 100644 --- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua @@ -583,7 +583,9 @@ function SingleFightPlayerView:SetIconShow(_eventpoint) self.eventPointPos:SetDialogueStr(strList1[num]) Timer.New(function() if self.dialogueRoot then - self.dialogueRoot.gameObject:SetActive(false) + if self.dialogueRoot.gameObject then + self.dialogueRoot.gameObject:SetActive(false) + end end if self.state == 1 then self.eventPointPos:ShowDialogue(true)