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

dev_chengFeng
ZhangBiao 2021-03-18 14:10:29 +08:00
commit db3340d779
6 changed files with 19 additions and 16 deletions

View File

@ -8805,7 +8805,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u91D1\u5E01 \u6B66\u5C06\u7ECF\u9A8C \u5524\u5143\u795E\u7B26 \u795E\u79D8\u795E\u5C06 m_Text: "\u91D1\u5E01 \u795E\u5C06\u7ECF\u9A8C \u5524\u5143\u795E\u7B26 \u795E\u79D8\u795E\u5C06
\u795E\u79D8\u9B42\u5370" \u795E\u79D8\u9B42\u5370"
LanguageIndex: 0 LanguageIndex: 0
--- !u!1 &3624098227883809207 --- !u!1 &3624098227883809207

View File

@ -2807,7 +2807,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.8, y: -16} m_AnchoredPosition: {x: 0, y: 27.050003}
m_SizeDelta: {x: 892.3, y: 366} m_SizeDelta: {x: 892.3, y: 366}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6391502736252782631 --- !u!114 &6391502736252782631

View File

@ -55,7 +55,7 @@ function ServerConfigManager.GetConfigInfo(key)
ConfigMgr=App.ConfigMgr ConfigMgr=App.ConfigMgr
end end
local s = ConfigMgr:GetConfigInfo(key) local s = ConfigMgr:GetConfigInfo(key)
LogError(key.."|"..tostring(s)) LogYellow(key.."|"..tostring(s))
return s return s
end end
end end

View File

@ -227,10 +227,10 @@ function GoodFriendMainPanel:OnShow()
this.roleImage2:SetActive(false) this.roleImage2:SetActive(false)
this.roleImage3:SetActive(false) this.roleImage3:SetActive(false)
this.roleImage4:SetActive(false) this.roleImage4:SetActive(false)
this:FriendListDataShow(true,true) -- this:FriendListDataShow(true,true)
this:FriendApplicationDataShow(true,true) -- this:FriendApplicationDataShow(true,true)
this:FriendSearchDataShow(true,true) -- this:FriendSearchDataShow(true,true)
this:BlackListDataShow(true,true) -- this:BlackListDataShow(true,true)
this.isInRecommendPage = true this.isInRecommendPage = true
this:OnRefreshData() this:OnRefreshData()
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.GoodFriend }) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.GoodFriend })
@ -336,7 +336,8 @@ function GoodFriendMainPanel:OnDestroy()
end end
--好友列表循环滚动数据 --好友列表循环滚动数据
function GoodFriendMainPanel:FriendListDataShow(isTop,isAni) function GoodFriendMainPanel:FriendListDataShow()
LogYellow("GoodFriendMainPanel:FriendListDataShow")
CheckRedPointStatus(RedPointType.Friend_GetAllReward) CheckRedPointStatus(RedPointType.Friend_GetAllReward)
this:OnRefreshData() this:OnRefreshData()
local list = {} local list = {}
@ -369,7 +370,7 @@ function GoodFriendMainPanel:FriendListDataShow(isTop,isAni)
-- else -- else
-- item.gameObject:SetActive(true) -- item.gameObject:SetActive(true)
-- end -- end
end,not isTop,not isAni) end)
if isPlayAnim then if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView1) SecTorPlayAnimByScroll(this.ScrollView1)
isPlayAnim = false isPlayAnim = false
@ -378,7 +379,7 @@ function GoodFriendMainPanel:FriendListDataShow(isTop,isAni)
this.haveGetRewardNumText.text=Language[10810]..(GoodFriendManager.MaxEnergy-GoodFriendManager.MaxEnergyGet).."/"..GoodFriendManager.MaxEnergy this.haveGetRewardNumText.text=Language[10810]..(GoodFriendManager.MaxEnergy-GoodFriendManager.MaxEnergyGet).."/"..GoodFriendManager.MaxEnergy
end end
--好友申请循环滚动数据 --好友申请循环滚动数据
function GoodFriendMainPanel:FriendApplicationDataShow(isTop,isAni) function GoodFriendMainPanel:FriendApplicationDataShow()
-- 检测红点 -- 检测红点
CheckRedPointStatus(RedPointType.Friend_Application) CheckRedPointStatus(RedPointType.Friend_Application)
this:OnRefreshData() this:OnRefreshData()
@ -416,7 +417,7 @@ function GoodFriendMainPanel:FriendApplicationDataShow(isTop,isAni)
-- else -- else
-- item.gameObject:SetActive(true) -- item.gameObject:SetActive(true)
-- end -- end
end,not isTop,not isAni) end)
if isPlayAnim then if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView2) SecTorPlayAnimByScroll(this.ScrollView2)
isPlayAnim = false isPlayAnim = false
@ -424,8 +425,7 @@ function GoodFriendMainPanel:FriendApplicationDataShow(isTop,isAni)
end end
--好友搜索循环滚动数据 --好友搜索循环滚动数据
function GoodFriendMainPanel:FriendSearchDataShow(isTop,isAni) function GoodFriendMainPanel:FriendSearchDataShow()
LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni))
this:OnRefreshData() this:OnRefreshData()
local list = {} local list = {}
local j = 1 local j = 1
@ -457,7 +457,7 @@ LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni)
-- else -- else
-- item.gameObject:SetActive(true) -- item.gameObject:SetActive(true)
-- end -- end
end,not isTop,not isAni) end)
if isPlayAnim then if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView3) SecTorPlayAnimByScroll(this.ScrollView3)
isPlayAnim = false isPlayAnim = false
@ -465,7 +465,7 @@ LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni)
end end
--黑名单滚动数据 --黑名单滚动数据
function GoodFriendMainPanel:BlackListDataShow(isTop,isAni) function GoodFriendMainPanel:BlackListDataShow()
this:OnRefreshData() this:OnRefreshData()
local list = {} local list = {}
local j = 1 local j = 1
@ -497,7 +497,7 @@ function GoodFriendMainPanel:BlackListDataShow(isTop,isAni)
-- else -- else
-- item.gameObject:SetActive(true) -- item.gameObject:SetActive(true)
-- end -- end
end,not isTop,not isAni) end)
if isPlayAnim then if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView4) SecTorPlayAnimByScroll(this.ScrollView4)
isPlayAnim = false isPlayAnim = false

View File

@ -221,6 +221,7 @@ function this:InitComponent()
this.btnFunHide[FUNCTION_OPEN_TYPE.GOODFRIEND] = this.btnFriend this.btnFunHide[FUNCTION_OPEN_TYPE.GOODFRIEND] = this.btnFriend
this.btnFunHide[FUNCTION_OPEN_TYPE.ALLRANKING] = this.btnRank this.btnFunHide[FUNCTION_OPEN_TYPE.ALLRANKING] = this.btnRank
this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng
this.btnFunHide[FUNCTION_OPEN_TYPE.POKEMON] = this.btnPokemon
this.animRoot = Util.GetGameObject(self.gameObject, "scene") this.animRoot = Util.GetGameObject(self.gameObject, "scene")
--挑战关卡快速升级提示 --挑战关卡快速升级提示

View File

@ -195,6 +195,8 @@ function XiaoYaoLuckyBossPopup:SetSelectHero(monsterData)
Util.GetGameObject(this.e_fightBtn,"layout/num"):GetComponent("Text").text = "<color=#1B262E>" .. costNum .. "</color>" Util.GetGameObject(this.e_fightBtn,"layout/num"):GetComponent("Text").text = "<color=#1B262E>" .. costNum .. "</color>"
end end
else else
costId = 16
costNum = 0
Util.GetGameObject(this.e_fightBtn,"Text").gameObject:SetActive(true) Util.GetGameObject(this.e_fightBtn,"Text").gameObject:SetActive(true)
Util.GetGameObject(this.e_fightBtn,"layout").gameObject:SetActive(false) Util.GetGameObject(this.e_fightBtn,"layout").gameObject:SetActive(false)
end end