Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
82927d38c0
File diff suppressed because it is too large
Load Diff
|
@ -681,7 +681,7 @@
|
|||
[10680] = "公会战防守",
|
||||
[10681] = "公会战进攻",
|
||||
[10682] = " 血战出征",
|
||||
[10683] = " 猎妖之路",
|
||||
[10683] = " 大闹天宫",
|
||||
[10684] = "发送队伍战力改变 ~~~~~~~~~~~~~~ ",
|
||||
[10685] = "向服務器請求掃蕩的次數2 mopUpDeleNum ============= ",
|
||||
[10686] = "遇到云游商人,当前时间戳为:",
|
||||
|
@ -697,7 +697,7 @@
|
|||
[10696] = "竞技防守",
|
||||
[10697] = "公会进攻",
|
||||
[10698] = "公会防守",
|
||||
[10699] = "猎妖之路",
|
||||
[10699] = "大闹天宫",
|
||||
[10700] = "编队保存成功",
|
||||
[10701] = "编队至少上阵%d个神将",
|
||||
[10702] = "编队没人,请先上人!",
|
||||
|
@ -1106,7 +1106,7 @@
|
|||
[11105] = "该神将在公会战防守阵容中已上阵",
|
||||
[11106] = "该神将在公会战进攻阵容中已上阵",
|
||||
[11107] = "该神将在血战出征阵容中已上阵",
|
||||
[11108] = "该神将在猎妖之路阵容中已上阵",
|
||||
[11108] = "该神将在大闹天宫阵容中已上阵",
|
||||
[11109] = "主线",
|
||||
[11110] = "竞技场防守",
|
||||
[11111] = "竞技场进攻",
|
||||
|
@ -1794,7 +1794,7 @@
|
|||
[11793] = "请选择一个需要归元的神将",
|
||||
[11794] = "点的我自己",
|
||||
[11795] = "别人",
|
||||
[11796] = "请选择一种宝物",
|
||||
[11796] = "请至少选择一项",
|
||||
[11797] = "宝物强化",
|
||||
[11798] = "宝物精炼",
|
||||
[11799] = "宝物强化大师等级",
|
||||
|
@ -2241,4 +2241,40 @@
|
|||
[12240] = "竞技排名",
|
||||
[12241] = "积分:",
|
||||
[12242] = "次",
|
||||
[12243] = "不知道",
|
||||
[12244] = "第%s场",
|
||||
[12245] = "历史最高排名:",
|
||||
[12246] = "30级或首充后解锁",
|
||||
[12247] = "森罗幻境排行",
|
||||
[12248] = "需要上阵%s名%s系神将",
|
||||
[12249] = "今日剩余次数:",
|
||||
[12250] = "噩梦",
|
||||
[12251] = "深渊",
|
||||
[12252] = "传奇",
|
||||
[12253] = "神话",
|
||||
[12254] = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力",
|
||||
[12255] = "通过上一难度开启",
|
||||
[12256] = "剩余时间:5天23小时",
|
||||
[12257] = "<color=#B54D52>(激活特权可增加次数)</color>",
|
||||
[12258] = "消耗材料不足",
|
||||
[12259] = "<color=red>挑战阶段加入公会,不允许参与本轮十绝阵!</color>",
|
||||
[12260] = "单日最大探宝次数:%s/%s",
|
||||
[12261] = "不可超出最大探宝次数!",
|
||||
[12262] = "高级探宝券不足!",
|
||||
[12263] = "猎妖师全部死亡,无法进入战斗!",
|
||||
[12264] = "次内必得金色魂印",
|
||||
[12265] = "无此装备",
|
||||
[12266] = "特殊",
|
||||
[12267] = "装备",
|
||||
[12268] = "宝物",
|
||||
[12269] = "魂印",
|
||||
[12270] = "材料",
|
||||
[12271] = "(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>装备!)",
|
||||
[12272] = "出售数量不可为0个",
|
||||
[12273] = "宝物将分解为宝魂,若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。",
|
||||
[12274] = "(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝器!)",
|
||||
[12275] = "分解后获得:",
|
||||
[12276] = "神将归元成功,等级重置为1级",
|
||||
[12277] = "未查询到符合条件的装备!",
|
||||
[12278] = "%d天%02d时",
|
||||
}
|
||||
|
|
|
@ -681,8 +681,10 @@ end
|
|||
|
||||
|
||||
--通过item稀有度读取背景框
|
||||
function GetQuantityImageByquality(quality)
|
||||
if quality == 1 then
|
||||
function GetQuantityImageByquality(quality,star)
|
||||
if star and star > 5 then
|
||||
return "r_characterbg_gules"
|
||||
elseif quality == 1 then
|
||||
return "r_characterbg_gray"
|
||||
elseif quality == 2 then
|
||||
return "r_characterbg_green"
|
||||
|
|
|
@ -198,7 +198,7 @@ function this.RefreshDefendFormation()
|
|||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
|
||||
SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), heroData.star,1)
|
||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
|
||||
Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
|
||||
Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality, heroData.star))
|
||||
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon))
|
||||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
end
|
||||
|
|
|
@ -264,7 +264,7 @@ function this.FreshTeam(formation, isBlue)
|
|||
SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), heroData.star,1)
|
||||
local demonId = heroData.heroTid
|
||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
||||
Util.GetGameObject(teamRoot[heroData.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
|
||||
Util.GetGameObject(teamRoot[heroData.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon))
|
||||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
end
|
||||
|
@ -283,7 +283,7 @@ function this.FreshTeam2(formation, isBlue)
|
|||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
|
||||
SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), heroData.star,1)
|
||||
local heroConfig = heroData.heroConfig
|
||||
Util.GetGameObject(teamRoot[formation.teamHeroInfos[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
|
||||
Util.GetGameObject(teamRoot[formation.teamHeroInfos[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon))
|
||||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
end
|
||||
|
|
|
@ -237,7 +237,7 @@ function this.FreshTeam()
|
|||
SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), heroData.star)
|
||||
local demonId = heroData.id
|
||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
||||
Util.GetGameObject(this.myBaby[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
|
||||
Util.GetGameObject(this.myBaby[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon))
|
||||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
end
|
||||
|
|
|
@ -636,7 +636,7 @@ function this.GetTableByBackDropData(drop)
|
|||
itemdata.backData = drop.Hero[i]
|
||||
itemdata.configData = ConfigManager.GetConfigData(ConfigName.HeroConfig, drop.Hero[i].heroId)
|
||||
itemdata.name = itemdata.configData.ReadingName
|
||||
itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality)
|
||||
itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality,itemdata.configData.Star)
|
||||
itemdata.icon = GetResourcePath(itemdata.configData.Icon)
|
||||
itemdata.num = 1
|
||||
table.insert(itemDataList, itemdata)
|
||||
|
@ -747,7 +747,7 @@ function this.GetItemListFromTempBag(drop, isSave)
|
|||
itemdata.backData = drop.Hero[i]
|
||||
itemdata.configData = ConfigManager.GetConfigData(ConfigName.HeroConfig, drop.Hero[i].heroId)
|
||||
itemdata.name = itemdata.configData.ReadingName
|
||||
itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality)
|
||||
itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality,itemdata.configData.Star)
|
||||
itemdata.icon = GetResourcePath(itemdata.configData.Icon)
|
||||
itemdata.num = 1
|
||||
table.insert(itemDataList, itemdata)
|
||||
|
@ -835,7 +835,7 @@ function this.GetAllTempBagData()
|
|||
itemdata.backData = v
|
||||
itemdata.configData = ConfigManager.GetConfigData(ConfigName.HeroConfig, v.heroId)
|
||||
itemdata.name = itemdata.configData.Name
|
||||
itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality)
|
||||
itemdata.frame = GetHeroQuantityImageByquality(itemdata.configData.Quality,itemdata.configData.Star)
|
||||
itemdata.Quantity = itemdata.configData.Star
|
||||
itemdata.icon = GetResourcePath(itemdata.configData.Icon)
|
||||
itemdata.num = 1
|
||||
|
|
|
@ -101,7 +101,7 @@ function this.SingleHeroDataShow(_go, _heroData)
|
|||
Util.GetGameObject(go, "choosed"):SetActive(false)
|
||||
local orderImage= Util.GetGameObject(go, "orderImage")
|
||||
orderImage:SetActive(false)
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star))
|
||||
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon)
|
||||
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
|
|
|
@ -228,7 +228,7 @@ function FindTreasureDispatchPanel:ShowSelectHeroData()
|
|||
end
|
||||
|
||||
function FindTreasureDispatchPanel:OnShowCardData(go,heroData,type)
|
||||
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
-- Util.GetGameObject(go.transform, "posIcon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon)
|
||||
|
|
|
@ -234,7 +234,7 @@ function this.SingleHeroDataShow(_go, _heroData)
|
|||
end
|
||||
end
|
||||
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon)
|
||||
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
|
|
|
@ -98,7 +98,7 @@ function this.SetShow(root,data,index)
|
|||
local heroId=data.HeroList[i]
|
||||
Util.GetGameObject(o,"Mask"):SetActive(not HeroManager.GetCurHeroIsHaveBySid(heroId))
|
||||
if HeroManager.GetCurHeroIsHaveBySid(heroId)==false then table.insert(nh,i) end --未拥有Hero的位置 存储位置信息
|
||||
Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality))
|
||||
Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality,heroConfig[heroId].Star))
|
||||
Util.GetGameObject(o,"Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroConfig[heroId].Icon))
|
||||
Util.GetGameObject(o,"ProIcon"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName))
|
||||
Util.GetGameObject(o,"Lv/Text"):GetComponent("Text").text=1
|
||||
|
|
|
@ -84,8 +84,8 @@ function this.SetCardSingleData(go,monsterId,_pos)
|
|||
zs:GetComponent("Image").sprite = Util.LoadSprite(zsName)
|
||||
end
|
||||
|
||||
yuanImage:SetActive(heroData.createtype == 1)
|
||||
lv.text=heroData.lv
|
||||
yuanImage:SetActive(false)
|
||||
lv.text=monsterConfig.Level
|
||||
|
||||
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroConfig.Star])
|
||||
|
||||
|
|
|
@ -287,7 +287,7 @@ function this.FormationAdapter(teamInfo)
|
|||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
||||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
|
||||
Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
|
||||
Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality,hero.star))
|
||||
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon))
|
||||
local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame")
|
||||
local heroData = {}
|
||||
|
|
|
@ -158,7 +158,8 @@ function this:OnLogout()
|
|||
|
||||
RequestPanel.Show(Language[11121])
|
||||
this.SetLoginPart(true)
|
||||
networkMgr:SendGetHttp(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s", LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel),
|
||||
Log(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s", LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel, ServerVersion))
|
||||
networkMgr:SendGetHttp(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s", LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel, ServerVersion),
|
||||
this.OnReceiveServerList, nil, nil, nil)
|
||||
end
|
||||
end
|
||||
|
@ -201,7 +202,8 @@ function this:OnOpen(...)
|
|||
|
||||
RequestPanel.Show(Language[11121])
|
||||
this.SetLoginPart(true)
|
||||
networkMgr:SendGetHttp(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s", LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel),
|
||||
Log(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s", LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel, ServerVersion))
|
||||
networkMgr:SendGetHttp(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s", LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel, ServerVersion),
|
||||
this.OnReceiveServerList, nil, nil, nil)
|
||||
end
|
||||
|
||||
|
|
|
@ -381,6 +381,7 @@ function this:InitComponent()
|
|||
this.animRoot = Util.GetGameObject(self.gameObject, "scene")
|
||||
|
||||
this.btnSupreme = Util.GetGameObject(self.gameObject, "RightUp/supreme")
|
||||
this.btnSupreme:SetActive(false)
|
||||
this.supremeRedPoint = Util.GetGameObject(this.btnSupreme, "redPoint")
|
||||
this.supremeTime = Util.GetGameObject(this.btnSupreme, "time"):GetComponent("Text")
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ function MapAwardPanel:OnOpen(...)
|
|||
go.transform.localPosition = Vector3.zero
|
||||
go:SetActive(true)
|
||||
|
||||
Util.GetGameObject(go,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(go,"icon"):GetComponent("Image").sprite=Util.LoadSprite(heroData.icon)
|
||||
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(go,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
|
|
|
@ -139,7 +139,7 @@ function this.SetSelectHero()
|
|||
local star=Util.GetGameObject(item,"star")
|
||||
local choosed=Util.GetGameObject(item,"choosed")
|
||||
local hpExp=Util.GetGameObject(item,"hpExp"):GetComponent("Slider")
|
||||
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[value.tmpId].Quality))
|
||||
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[value.tmpId].Quality,value.star))
|
||||
icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[value.tmpId].Icon))
|
||||
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[value.tmpId].PropertyName))
|
||||
lv.text=value.level
|
||||
|
|
|
@ -487,7 +487,7 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
|
|||
local star=Util.GetGameObject(o,"star")
|
||||
local choosed=Util.GetGameObject(o,"choosed")
|
||||
local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider")
|
||||
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality))
|
||||
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality, v.star))
|
||||
icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon))
|
||||
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName))
|
||||
lv.text=v.level
|
||||
|
|
|
@ -209,7 +209,7 @@ function this.FormationAdapter(teamInfo)
|
|||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
||||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
|
||||
Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
|
||||
Util.GetGameObject(this.Demons[hero.position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
|
||||
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon))
|
||||
local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame")
|
||||
local heroData = {}
|
||||
|
|
|
@ -197,7 +197,7 @@ end
|
|||
--RoleInfo0
|
||||
function this.RoleInfo0()
|
||||
LogBlue(curHeroData.id.." "..curHeroData.dynamicId)
|
||||
this.head_Frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality))
|
||||
this.head_Frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality, curHeroData.star))
|
||||
this.head_Icon.sprite = Util.LoadSprite(curHeroData.icon)
|
||||
this.head_Pro.sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
|
||||
this.head_Lv.text = curHeroData.lv
|
||||
|
|
|
@ -133,7 +133,7 @@ function this.RefreshPanel()
|
|||
local star=Util.GetGameObject(o,"star")
|
||||
local choosed=Util.GetGameObject(o,"choosed")
|
||||
local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider")
|
||||
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality))
|
||||
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality,v.star))
|
||||
icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon))
|
||||
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName))
|
||||
lv.text=v.level
|
||||
|
|
|
@ -266,7 +266,7 @@ end
|
|||
|
||||
-- 节点数据匹配
|
||||
function this.SingleHeroDataShow(go, heroData, index)
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star))
|
||||
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
Util.GetGameObject(go, "posIcon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon)
|
||||
|
|
|
@ -89,7 +89,7 @@ end
|
|||
function this.SingleHeroDataShow(go,_heroData)
|
||||
local heroData = _heroData
|
||||
local _go = go
|
||||
Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = heroData.heroConfig.ReadingName
|
||||
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
|
|
|
@ -126,7 +126,7 @@ end
|
|||
function this.SingleHeroDataShow(go,_heroData)
|
||||
local heroData = _heroData
|
||||
local _go = go
|
||||
Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = heroData.heroConfig.ReadingName
|
||||
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
|
|
|
@ -698,12 +698,12 @@ function this:UpdateHeroUpStarData()
|
|||
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
|
||||
if curUpStarData[i].upStarMaterialsData.Issame==1 then
|
||||
Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon))
|
||||
Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality, curUpStarData[i].upStarMaterialsData.StarLimit))
|
||||
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
|
||||
elseif curUpStarData[i].upStarMaterialsData.IsId>0 then
|
||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, curUpStarData[i].upStarMaterialsData.IsId)
|
||||
Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroConfig.Icon))
|
||||
Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig.Quality))
|
||||
Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig.Quality, curUpStarData[i].upStarMaterialsData.StarLimit))
|
||||
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
end
|
||||
else
|
||||
|
|
|
@ -97,7 +97,7 @@ function this.RefreshPanel()
|
|||
local heroId=_curData[i].HeroList[j]
|
||||
Util.GetGameObject(o,"Mask"):SetActive(not HeroManager.GetCurHeroIsHaveBySid(heroId))
|
||||
if HeroManager.GetCurHeroIsHaveBySid(heroId)==false then table.insert(nh,j) end --未拥有Hero的位置 存储位置信息
|
||||
Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality))
|
||||
Util.GetGameObject(o,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[heroId].Quality,heroConfig[heroId].Star))
|
||||
Util.GetGameObject(o,"Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(heroConfig[heroId].Icon))
|
||||
Util.GetGameObject(o,"ProIcon"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName))
|
||||
Util.GetGameObject(o,"Lv/Text"):GetComponent("Text").text=1
|
||||
|
|
|
@ -71,7 +71,7 @@ function this.OnShowSingleCardData(go,heroData)
|
|||
celectCardGo = go
|
||||
choosed:SetActive(true)
|
||||
end
|
||||
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star))
|
||||
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
Util.GetGameObject(go.transform, "posIcon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon)
|
||||
|
|
|
@ -131,7 +131,7 @@ end
|
|||
function RoleReturnPanel:OnShowHeroData()
|
||||
--curHeroData
|
||||
--self.heroGo
|
||||
Util.GetGameObject(self.heroGo, "hero/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality))
|
||||
Util.GetGameObject(self.heroGo, "hero/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality,curHeroData.star))
|
||||
Util.GetGameObject(self.heroGo, "hero/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon))
|
||||
Util.GetGameObject(self.heroGo, "hero/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
|
||||
Util.GetGameObject(self.heroGo, "hero/lv/Text"):GetComponent("Text").text = curHeroData.lv
|
||||
|
|
|
@ -128,7 +128,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
|||
curSelectHeroList[heroData.dynamicId]=heroData
|
||||
choosed:SetActive(true)
|
||||
end
|
||||
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
|
||||
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
Util.GetGameObject(go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon)
|
||||
|
|
|
@ -363,7 +363,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
--Util.ClearChild(self.starGrid.transform)
|
||||
local star = _reward[4] or itemConfig[itemSId].HeroStar[2]
|
||||
SetHeroStars(self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
|
||||
self.frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConfigData.Quality))
|
||||
self.frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConfigData.Quality,star))
|
||||
self.icon.sprite = Util.LoadSprite(GetResourcePath(heroConfigData.Icon))
|
||||
self.proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfigData.PropertyName))
|
||||
--self.posImage.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(heroConfigData.Profession))
|
||||
|
@ -381,7 +381,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
--2角色碎片
|
||||
self.frameMask:SetActive(true)
|
||||
self.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity,itemConfig[itemSId].HeroStar[2]))
|
||||
self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
local propertyName=itemConfig[itemSId].PropertyName
|
||||
if(propertyName~=0) then
|
||||
|
|
|
@ -680,7 +680,7 @@
|
|||
10680,公会战防守
|
||||
10681,公会战进攻
|
||||
10682, 血战出征
|
||||
10683, 猎妖之路
|
||||
10683, 大闹天宫
|
||||
10684,发送队伍战力改变 ~~~~~~~~~~~~~~
|
||||
10685,向服務器請求掃蕩的次數2 mopUpDeleNum =============
|
||||
10686,遇到云游商人,当前时间戳为:
|
||||
|
@ -696,7 +696,7 @@
|
|||
10696,竞技防守
|
||||
10697,公会进攻
|
||||
10698,公会防守
|
||||
10699,猎妖之路
|
||||
10699,大闹天宫
|
||||
10700,编队保存成功
|
||||
10701,编队至少上阵%d个神将
|
||||
10702,编队没人,请先上人!
|
||||
|
@ -1105,7 +1105,7 @@
|
|||
11105,该神将在公会战防守阵容中已上阵
|
||||
11106,该神将在公会战进攻阵容中已上阵
|
||||
11107,该神将在血战出征阵容中已上阵
|
||||
11108,该神将在猎妖之路阵容中已上阵
|
||||
11108,该神将在大闹天宫阵容中已上阵
|
||||
11109,主线
|
||||
11110,竞技场防守
|
||||
11111,竞技场进攻
|
||||
|
@ -2240,3 +2240,39 @@
|
|||
12240,竞技排名
|
||||
12241,积分:
|
||||
12242,次
|
||||
12243,不知道
|
||||
12244,第%s场
|
||||
12245,历史最高排名:
|
||||
12246,30级或首充后解锁
|
||||
12247,森罗幻境排行
|
||||
12248,需要上阵%s名%s系神将
|
||||
12249,今日剩余次数:
|
||||
12250,噩梦
|
||||
12251,深渊
|
||||
12252,传奇
|
||||
12253,神话
|
||||
12254,妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力
|
||||
12255,通过上一难度开启
|
||||
12256,剩余时间:5天23小时
|
||||
12257,<color=#B54D52>(激活特权可增加次数)</color>
|
||||
12258,消耗材料不足
|
||||
12259,<color=red>挑战阶段加入公会,不允许参与本轮十绝阵!</color>
|
||||
12260,单日最大探宝次数:%s/%s
|
||||
12261,不可超出最大探宝次数!
|
||||
12262,高级探宝券不足!
|
||||
12263,猎妖师全部死亡,无法进入战斗!
|
||||
12264,次内必得金色魂印
|
||||
12265,无此装备
|
||||
12266,特殊
|
||||
12267,装备
|
||||
12268,宝物
|
||||
12269,魂印
|
||||
12270,材料
|
||||
12271,(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>装备!)
|
||||
12272,出售数量不可为0个
|
||||
12273,宝物将分解为宝魂,若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。
|
||||
12274,(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝器!)
|
||||
12275,分解后获得:
|
||||
12276,神将归元成功\,等级重置为1级
|
||||
12277,未查询到符合条件的装备!
|
||||
12278,%d天%02d时
|
||||
|
|
|
Loading…
Reference in New Issue