Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-03-17 16:01:02 +08:00
commit b630889891
8 changed files with 6864 additions and 6862 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 77 KiB

File diff suppressed because it is too large Load Diff

View File

@ -390,6 +390,7 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex)
--绑定组件
local localSelf = self
local name = Util.GetGameObject(item, "context/text"):GetComponent("Text")
Util.GetGameObject(item, "context/Image"):GetComponent("Image").sprite = Util.LoadSprite("c_czlb_yuan_zh")
local icon = Util.GetGameObject(item, "btnBuy/icon")
local price = Util.GetGameObject(item, "btnBuy/price"):GetComponent("Text")
local buyInfo = Util.GetGameObject(item, "buyInfo"):GetComponent("Text")

View File

@ -634,6 +634,12 @@ function RoleInfoLayout:OnClose()
FixedUpdateBeat:Remove(this.OnUpdate, self)
if this.priThread then
coroutine.stop(this.priThread)
-- 关闭显示
for i = 1, 4 do
lvUpShowProList[i]:SetActive(false)
end
this.lvUpGo:SetActive(false)
this.priThread = nil
end
end

View File

@ -125,7 +125,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.iconGo:SetActive(true)
self.circleFrameBg:SetActive(false)
self.name:GetComponent("Text").text = SubString2(GetLanguageStrById( _itemData.configData.Name),8)
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById( _itemData.configData.Name),5)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu)
@ -211,7 +211,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
--装备
self.num:SetActive(_itemData.num > 1)
self.num:GetComponent("Text").text = _itemData.num
self.name:GetComponent("Text").text =SubString2(GetLanguageStrById( _itemData.configData.Name),8)
self.name:GetComponent("Text").text =GetCutOutStr(GetLanguageStrById( _itemData.configData.Name),5)
self.starGrid:SetActive(true)
EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
@ -259,7 +259,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
--equip
self.num:SetActive(_itemData.num > 1)
self.num:GetComponent("Text").text = _itemData.num
self.name:GetComponent("Text").text = SubString2(GetLanguageStrById(_itemData.configData.Name),8)
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(_itemData.configData.Name),5)
self.starGrid:SetActive(true)
EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
@ -274,7 +274,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
elseif _itemData.itemType == 3 then
--hero
self.num:SetActive(false)
self.name:GetComponent("Text").text = SubString2(GetLanguageStrById(_itemData.configData.ReadingName),8)
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(_itemData.configData.ReadingName),5)
self.heroShowGo:SetActive(true)
self.starGrid:SetActive(true)
SetHeroStars(self.starGrid, _itemData.backData.star,1,Vector2.New(32.5,32.5),-15)
@ -292,7 +292,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
elseif _itemData.itemType == 4 then
--法宝
self.num:SetActive(false)
self.name:GetComponent("Text").text = SubString2(_itemData.name,8)
self.name:GetComponent("Text").text = GetCutOutStr(_itemData.name,5)
self.starGrid:SetActive(true)
SetHeroStars(self.starGrid, _itemData.backData.rebuildLevel,1,Vector2.New(32.5,32.5),-15)
Util.AddOnceClick(self.frameBtn, function()
@ -305,7 +305,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
end
elseif _itemData.itemType == 5 then
self.num:SetActive(false)
self.name:GetComponent("Text").text = SubString2(_itemData.name,8)
self.name:GetComponent("Text").text = GetCutOutStr(_itemData.name,5)
--self.resetLv:GetComponent("Text").text = "+" .._itemData.lv.." ".._itemData.refineLv
self.resetLv:SetActive(false)
self.fragmentIcon:SetActive(true)
@ -318,7 +318,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
end)
elseif _itemData.itemType == 6 then
self.num:SetActive(false)
self.name:GetComponent("Text").text = SubString2(_itemData.name,8)
self.name:GetComponent("Text").text = GetCutOutStr(_itemData.name,5)
-- self.resetLv:GetComponent("Text").text = "+" ..1
self.resetLv:SetActive(false)
self.fragmentIcon:SetActive(false)
@ -374,7 +374,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.resetLv:SetActive(false)
self.pokemonEffect:SetActive(false)
self.item:SetActive(true)
self.name:GetComponent("Text").text = SubString2(GetLanguageStrById(itemDataConFig.Name),8)
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(itemDataConFig.Name),5)
self.innateImage:SetActive(false)
self.UI_Effect_Kuang_JinSe:SetActive(false)
self.UI_Effect_Kuang_HongSe:SetActive(false)
@ -426,7 +426,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfigData.PropertyName))
--self.posImage.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(heroConfigData.Profession))
--self.heroStage.sprite = Util.LoadSprite(HeroStageSprite[heroConfigData.HeroStage])
self.name:GetComponent("Text").text = SubString2(GetLanguageStrById(heroConfigData.ReadingName),8)
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(heroConfigData.ReadingName),5)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id,star)
end)