From 9f8a65e45326d593ab3f7da766acb91fd893e64d Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Fri, 5 Jan 2024 18:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BG/UI/Equip/UI_hz_zhonghe03_20.png | Bin 0 -> 3934 bytes .../BG/UI/Equip/UI_hz_zhonghe03_20.png.meta | 110 +++++++++++++ .../Prefabs/UI/cardView/card.prefab | 149 +++++++++++++----- .../HandBookHeroAndEquipListPanel.lua | 4 + .../~Lua/Modules/Map/Config/MapConfig.lua | 14 +- .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 1 + .../~Lua/View/SingleFightPlayerView.lua | 4 +- 7 files changed, 236 insertions(+), 46 deletions(-) create mode 100644 Assets/ManagedResources/BG/UI/Equip/UI_hz_zhonghe03_20.png create mode 100644 Assets/ManagedResources/BG/UI/Equip/UI_hz_zhonghe03_20.png.meta diff --git a/Assets/ManagedResources/BG/UI/Equip/UI_hz_zhonghe03_20.png b/Assets/ManagedResources/BG/UI/Equip/UI_hz_zhonghe03_20.png new file mode 100644 index 0000000000000000000000000000000000000000..10239c664465cfe8505dd26ca889273ea90e346c GIT binary patch literal 3934 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/BG/UI/Equip/UI_hz_zhonghe03_20.png.meta b/Assets/ManagedResources/BG/UI/Equip/UI_hz_zhonghe03_20.png.meta new file mode 100644 index 0000000000..81aaf3feba --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Equip/UI_hz_zhonghe03_20.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 31967916d1d7c6f47b79baaabd654e04 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a5a91b610e6ef644782dd634a93232bd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab b/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab index d7f4927be6..424a813481 100644 --- a/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab +++ b/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -95,7 +95,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1298132580563460616 RectTransform: m_ObjectHideFlags: 0 @@ -110,7 +110,7 @@ RectTransform: - {fileID: 326373475629622326} - {fileID: 4014327040002272395} m_Father: {fileID: 3396417040355110936} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -141,6 +141,80 @@ MonoBehaviour: m_Spacing: {x: -12.04, y: 0} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1 &2623199879758124776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8422961301032672449} + - component: {fileID: 3405272048609084468} + - component: {fileID: 3651996204105101746} + m_Layer: 5 + m_Name: core + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8422961301032672449 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623199879758124776} + 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: 3396417040355110936} + 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: 74.8, y: 196.2} + m_SizeDelta: {x: 30, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3405272048609084468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623199879758124776} + m_CullTransparentMesh: 0 +--- !u!114 &3651996204105101746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623199879758124776} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 31967916d1d7c6f47b79baaabd654e04, 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 &2787689028138261110 GameObject: m_ObjectHideFlags: 0 @@ -469,6 +543,7 @@ RectTransform: m_Children: - {fileID: 3461655562413708068} - {fileID: 3395912715129006028} + - {fileID: 8422961301032672449} - {fileID: 3461041183831773760} - {fileID: 3461416457997464738} - {fileID: 3880253530736025899} @@ -602,7 +677,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -675,7 +750,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -723,7 +798,7 @@ RectTransform: m_Children: - {fileID: 3395823834833100134} m_Father: {fileID: 3396417040355110936} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -927,7 +1002,7 @@ RectTransform: m_Children: - {fileID: 3395968103936434378} m_Father: {fileID: 3396417040355110936} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1001,7 +1076,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 16.51} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1150,7 +1225,7 @@ RectTransform: m_Children: - {fileID: 3461094561493497734} m_Father: {fileID: 3396417040355110936} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1224,7 +1299,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1393,7 +1468,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1503,7 +1578,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1618,7 +1693,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 4 + 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} @@ -1766,7 +1841,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1865,7 +1940,7 @@ PrefabInstance: - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} propertyPath: m_RootOrder - value: 16 + value: 17 objectReference: {fileID: 0} - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} @@ -2114,9 +2189,9 @@ PrefabInstance: objectReference: {fileID: 1271572592464149432} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} ---- !u!4 &1271572592464149428 stripped +--- !u!4 &1271572592464149430 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} @@ -2126,6 +2201,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} +--- !u!4 &1271572592464149424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 1745768441} + m_PrefabAsset: {fileID: 0} --- !u!4 &1271572592464149422 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2204,15 +2285,15 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} ---- !u!4 &1165092670169827409 stripped +--- !u!4 &1271572592464149428 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} ---- !u!4 &1271572592464149424 stripped +--- !u!4 &1165092670169827407 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} @@ -2228,12 +2309,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} ---- !u!4 &1165092670169827401 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 1745768441} - m_PrefabAsset: {fileID: 0} --- !u!4 &1165092670169827399 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2264,6 +2339,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} +--- !u!4 &1165092670169827401 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 1745768441} + m_PrefabAsset: {fileID: 0} --- !u!224 &7128533549541609610 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2276,15 +2357,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} ---- !u!4 &1271572592464149430 stripped +--- !u!4 &1165092670169827409 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 1745768441} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1165092670169827407 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} @@ -2343,7 +2418,7 @@ PrefabInstance: - target: {fileID: 623698330797109407, guid: 712846a3c1022a748be7ddd8db4690fc, type: 3} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 623698330797109407, guid: 712846a3c1022a748be7ddd8db4690fc, type: 3} @@ -2423,7 +2498,7 @@ PrefabInstance: - target: {fileID: 7306042643356303935, guid: 49af885bbd9477844bc856422752773b, type: 3} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 7306042643356303935, guid: 49af885bbd9477844bc856422752773b, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua index 0ccf67eb9e..916a5d2fbe 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua @@ -722,6 +722,7 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...) --SetHEeroLiveToward(Util.GetGameObject(_go.transform, "card/icon"),heroData.Toward) Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) Util.GetGameObject(_go.transform, "card/heroStage"):SetActive(false) + Util.GetGameObject(_go.transform, "card/core"):SetActive(heroData.Main==1) local starGrid = Util.GetGameObject(_go.transform, "star") local aaa=star if aaa==11 then @@ -736,10 +737,13 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...) if PlayerManager.GetHeroDataByStar(0,heroData.Id) then Util.SetGray(Util.GetGameObject(_go.transform, "card/icon"), false) Util.SetGray(Util.GetGameObject(_go.transform, "card/pro/Image"), false) + Util.SetGray(Util.GetGameObject(_go.transform, "card/core"), false) Util.GetGameObject(_go.transform, "card"):GetComponent("Image").material = nil else Util.SetGray(Util.GetGameObject(_go.transform, "card/icon"), true) Util.SetGray(Util.GetGameObject(_go.transform, "card/pro/Image"), true) + Util.SetGray(Util.GetGameObject(_go.transform, "card/core"), true) + -- Util.GetGameObject(_go.transform, "card/core"):SetActive(heroData.heroConfig.Main==1) Util.GetGameObject(_go.transform, "card"):GetComponent("Image").material = Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").material end end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua index 3ea1954455..a35565f36f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua @@ -13,13 +13,13 @@ ANIMATION = { MapFloatingConfig = { [0] = {name = "live2d_npc_mao_difang", scale = Vector3.New(0.23, 0.23, 0.23), - position = Vector3.New(0, -10, 0)}, + position = Vector3.New(0, -40, 0)}, [1] = {name = "live2d_npc_mao_difang", scale = Vector3.New(0.23, 0.23, 0.23), - position = Vector3.New(0, -10, 0)}, + position = Vector3.New(0, -40, 0)}, [2] = {name = "live2d_npc_mao_difang", scale = Vector3.New(0.23, 0.23, 0.23), - position = Vector3.New(0, 40, 0)}, + position = Vector3.New(0, -40, 0)}, [3] = {name = "live2d_npc_mao_difang", scale = Vector3.New(0.23, 0.23, 0.23), position = Vector3.New(0, 32, 0)}, @@ -28,10 +28,10 @@ MapFloatingConfig = { position = Vector3.New(-130, -5,0)}, [5] = {name = "live2d_npc_mao_difang", scale = Vector3.New(0.23, 0.23, 0.23), - position = Vector3.New(0, -10, 0)}, + position = Vector3.New(0,-40, 0)}, [6] = {name = "live2d_npc_mao_difang", - scale = Vector3.New(0.2, 0.2, 0.2), - position = Vector3.zero}, + scale = Vector3.New(0.23, 0.23, 0.23), + position = Vector3.New(0, -40, 0)}, [7] = {name = "live2d_npc_mao_difang",--福星高照NPC scale = Vector3.New(0.23, 0.23, 0.23), position = Vector3.New(0, -40, 0)}, @@ -65,7 +65,7 @@ MapFloatingConfig = { position = Vector3.New(0, 48, 0)}, [17] = {name = "live2d_npc_mao_difang",--数独NPC scale = Vector3.New(0.23, 0.23, 0.23), - position = Vector3.New(0, 40, 0)}, + position = Vector3.New(0, -40, 0)}, [18] = {name = "live2d_tiangongboss",--转盘NPC scale = Vector3.New(0.1, 0.1, 0.1), position = Vector3.New(0, 40, 0)}, diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index d9396be6a5..4b8ff3f7ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -304,6 +304,7 @@ function this.SingleHeroDataShow(_go,_heroData) Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage]) local redPoint = Util.GetGameObject(_go.transform, "card/redAndLock/redPoint") Util.GetGameObject(_go.transform, "card/redAndLock/lockImage"):SetActive(heroData.lockState == 1) + Util.GetGameObject(_go.transform, "card/core"):SetActive(heroData.heroConfig.Main == 1) Util.GetGameObject(_go.transform, "card/starnum"):GetComponent("Text").text=_heroData.star.."/".._heroData.maxStar _go.transform.localScale = Vector3.one * 0.95 local starGrid = Util.GetGameObject(_go.transform, "star") diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua index ce470b3106..984344c068 100644 --- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua @@ -523,9 +523,9 @@ function SingleFightPlayerView:SetRoleDirAction(u, v, isBack) local dV = isBack and self.roleCurPos.v - v or v - self.roleCurPos.v if dU > 0 then - self:SetWalkDir(WALK_DIR.RUN_RIGHT) - elseif dU < 0 then self:SetWalkDir(WALK_DIR.RUN_LEFT) + elseif dU < 0 then + self:SetWalkDir(WALK_DIR.RUN_RIGHT) elseif dV < 0 then self:SetWalkDir(WALK_DIR.RUN_UP) elseif dV > 0 then