From fc7552f55f11c3d76639a11bdfa8f9df5e0afa06 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 19 Aug 2020 02:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E6=8A=A2=E5=A4=BA=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E4=BA=BA=E7=89=A9=E5=A4=B4=E5=83=8F=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E5=9B=9B=E5=85=83=E9=98=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A2=84=E8=AE=BE=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Recruit/ElementDrawCardPanel.prefab | 22 +++++++------------ .../Guild/CarDelay/GuildCarDelayLootPopup.lua | 1 + 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab index 68b3fc097d..9e83045dc1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab @@ -16173,7 +16173,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9635\u8425\u62DB\u52DF" + m_Text: "\u9635\u8425\u53EC\u5524" LanguageIndex: 11450 --- !u!1 &538543657769229325 GameObject: @@ -18891,7 +18891,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: -322, z: 0} initFloat: 0 @@ -20649,7 +20648,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9635\u8425\u62DB\u52DF" + m_Text: "\u9635\u8425\u53EC\u5524" LanguageIndex: 11450 --- !u!1 &3447059933404493099 GameObject: @@ -21755,7 +21754,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.24 - m_Text: "\u5FC5\u5F97\u9053\u795E\u5C06\u788E\u7247" + m_Text: "\u5FC5\u5F97\u9053\u7CFB\u795E\u5C06\u788E\u7247" LanguageIndex: 11466 --- !u!1 &3781271057767658244 GameObject: @@ -22080,7 +22079,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.24 - m_Text: "\u5FC5\u5F97\u4EBA\u795E\u5C06\u788E\u7247" + m_Text: "\u5FC5\u5F97\u4EBA\u7CFB\u795E\u5C06\u788E\u7247" LanguageIndex: 11453 --- !u!1 &4043850152873593602 GameObject: @@ -22891,7 +22890,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: -322, z: 0} initFloat: 0 @@ -23651,7 +23649,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: -3.434689, y: 12, z: 0} initFloat: 0 @@ -24426,7 +24423,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9635\u8425\u62DB\u52DF" + m_Text: "\u9635\u8425\u53EC\u5524" LanguageIndex: 11450 --- !u!1 &5651944146330559363 GameObject: @@ -25086,7 +25083,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: -322, z: 0} initFloat: 0 @@ -25870,7 +25866,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: -322, z: 0} initFloat: 0 @@ -26706,7 +26701,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.24 - m_Text: "\u5FC5\u5F97\u5996\u795E\u5C06\u788E\u7247" + m_Text: "\u5FC5\u5F97\u5996\u7CFB\u795E\u5C06\u788E\u7247" LanguageIndex: 11463 --- !u!1 &6650934384093044872 GameObject: @@ -28421,7 +28416,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9635\u8425\u62DB\u52DF" + m_Text: "\u9635\u8425\u53EC\u5524" LanguageIndex: 11450 --- !u!1 &7754298523838717437 GameObject: @@ -30150,7 +30145,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.24 - m_Text: "\u5FC5\u5F97\u4F5B\u795E\u5C06\u788E\u7247" + m_Text: "\u5FC5\u5F97\u4F5B\u7CFB\u795E\u5C06\u788E\u7247" LanguageIndex: 11461 --- !u!1 &8802956011602851032 GameObject: @@ -30618,7 +30613,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: -322, z: 0} initFloat: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index aaafde0ae2..1688ad4f0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -117,6 +117,7 @@ function this.SingleInfoDataShow(go,data) heroGo:SetActive(true) local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,data.teamInfo[i].heroTid) Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(curHeroConfig.Icon)) + Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroConfig.PropertyName)) Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(nil,data.teamInfo[i].star)) SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), data.teamInfo[i].star) Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text=data.teamInfo[i].level