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

dev_chengFeng
ZhangBiao 2021-03-18 10:11:10 +08:00
commit fb7bdbbe29
4 changed files with 4 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -13681,7 +13681,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d44413cd520156b4f874b77dd529bf22, type: 3}
m_Sprite: {fileID: 21300000, guid: f62be2bcbda7be34890c96bcd9f9797d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -657,6 +657,7 @@ function this.CreatActivity()
if not activityTabs[k] then
activityTabs[k] = {}
activityTabs[k].go = newObjToParent(this.activityTabPrefab,this.RightUp)
activityTabs[k].go.gameObject.name = "tab"..v.Id
activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image")
activityTabs[k].timeImg = Util.GetGameObject(activityTabs[k].go, "Image_1")
activityTabs[k].timeText = Util.GetGameObject(activityTabs[k].timeImg, "time"):GetComponent("Text")

View File

@ -174,8 +174,8 @@ function this.SetEquipData(index,data,equipConfigData,itemConfigData)
this.equipPanel[index].qualityText.text= GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality))
this.equipPanel[index].curEquipName.text=GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name))
this.equipPanel[index].curEquipFrame.sprite = Util.LoadSprite(curEquipData.frame)
this.equipPanel[index].curEquipIcon.sprite = Util.LoadSprite(curEquipData.icon)
this.equipPanel[index].curEquipFrame.sprite = Util.LoadSprite(GetQuantityImageByquality(equipConfigData.Quality))
this.equipPanel[index].curEquipIcon.sprite = Util.LoadSprite(GetResourcePath(itemConfigData.ResourceID))
this.equipPanel[index].curEquipTypeText.text=string.format(Language[11555],GetEquipPosStrByEquipPosNum(equipConfigData.Position))
local strPos=""
if equipConfigData.ProfessionLimit==0 then