Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
gaoxin 2020-07-31 16:28:19 +08:00
commit c2f436a3d6
3 changed files with 9 additions and 14 deletions

View File

@ -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<color=#EDB54B>\u9053</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u9053\u7CFB</color>\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<color=#EDB54B>\u4EBA</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u4EBA\u7CFB</color>\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<color=#EDB54B>\u5996</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u5996\u7CFB</color>\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<color=#EDB54B>\u4F5B</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u4F5B\u7CFB</color>\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

View File

@ -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