diff --git a/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab index 4b1c1122d7..8ac68b7082 100644 --- a/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Likability/LikeAbilityPanel.prefab @@ -12157,7 +12157,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2682774768257850983 RectTransform: m_ObjectHideFlags: 0 @@ -12172,9 +12172,9 @@ RectTransform: m_Father: {fileID: 305792749730430181} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -35} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &2578050656831745031 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab index e297f269f1..8697423174 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab @@ -1070,7 +1070,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8375993777823693432 RectTransform: m_ObjectHideFlags: 0 @@ -1085,10 +1085,10 @@ RectTransform: m_Father: {fileID: 9090717114976058863} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -48.35} + m_SizeDelta: {x: 160, y: 35} m_Pivot: {x: 0, y: 1} --- !u!222 &5747301298875000768 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab index 0351ebf347..6b30b7ef84 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab @@ -1308,7 +1308,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8375993777823693432 RectTransform: m_ObjectHideFlags: 0 @@ -1323,10 +1323,10 @@ RectTransform: m_Father: {fileID: 9090717114976058863} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -48.35} + m_SizeDelta: {x: 160, y: 35} m_Pivot: {x: 0, y: 1} --- !u!222 &5747301298875000768 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 76b0ac242d..32d851920b 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -404,8 +404,8 @@ UIName = { RecruitMainPanel = 405, LikeAbilityPanel = 421, HeroLikeAbilityPanel = 422, - RoleLikeabilityPopup = 423, - LikeabilityPopup = 424, + RoleLikeabilityPopup = 427, + LikeabilityPopup = 426, XunBaoMiZongPanel = 406, --寻宝迷踪 XunBaoMiZongMapPanel = 407, --寻宝迷踪地图界面 taiChuMiJuan = 408, --太初密卷 diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua index 9427a424ab..9ad30c5c0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua @@ -21,7 +21,7 @@ function this.InitializeTableData() data.Type = v.Type data.lv = v.Level data.value = v.FavorDegree - data.pro = v.Property + data.Property = v.Property data.priPro = v.PrivilegeProperty if v.Type == 1 then table.insert(this.TotalLvList,data) @@ -318,14 +318,14 @@ function this.GetViewProData(indexType,add,lv,title1,title2,subtitle1,subtitle2, if title2 and title2 ~= "" then table.insert(data.prolist,string.format(title2,color,lv,num,totalNum)) end - this.GetViewProData(indexType,add,lv,subtitle1,subtitle2,nextLv,data.prolist,color) + this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,data.prolist,color) end else local color = "5dc446" if title2 and title2 ~= "" then table.insert(data.prolist,string.format(title2,color,lv,num,totalNum)) end - this.GetViewProData(indexType,add,lv,subtitle1,subtitle2,nextLv,data.prolist,color) + this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,data.prolist,color) end return data end @@ -342,10 +342,10 @@ function this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,list,c local num = 0 local pro1 = LikabilityManager.GetProData(indexType,add,lv) local str = this.SetProvalue(pro1,1,subtitle1,nextLv,indexType,color) - table.inser(list,str) + table.insert(list,str) local pro2 = LikabilityManager.GetPrivilageProData(indexType,add,lv) str = this.SetProvalue(pro2,2,subtitle2,nextLv,indexType,color) - table.inser(list,str) + table.insert(list,str) end --属性列表 ,1属性 2特权, 标签, diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua index 8a717a11ea..e9284a0fd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua @@ -101,14 +101,14 @@ function LikeAbilityPanel:UpdateTopLayoutPanel() self.progress.text = "好感度最佳" else self.likeabilitymask.fillAmount = num/totalNum - self.progress.text = string.format("%s/%s",self.value,self.totalNum) + self.progress.text = string.format("%s/%s",num,totalNum) end self:UpDataProList(lv) end function LikeAbilityPanel:UpDataProList(lv) - local pro1 = LikabilityManager:GetViewProData(1,-1,lv,"总好感度属性:","","全体%s 全体%s","",nil) - local pro2 = LikabilityManager:GetViewProData(1,lv,lv,"当前等级加成:","","属性:%s %s","特权:%s",nil) + local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"总好感度属性:","","全体%s 全体%s","",nil) + local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"当前等级加成:","","属性:%s %s","特权:%s",nil) for i = 1,#self.proList do self.proList[i].go.gameObject:SetActive(false) end @@ -123,9 +123,10 @@ function LikeAbilityPanel:UpDataProSingleList(data,index) end self.proList[index].go.gameObject:SetActive(true) self.proList[index].title = Util.GetGameObject(self.proList[index].go, "title"):GetComponent("Text") + LogGreen("data.content:"..data.content) self.proList[index].title.text = data.content for i = 1,math.max(#self.proList[index],#data.prolist) do - if not data.prolist[index][i] then + if not data.prolist[i] then self.proList[index][i].go.gameObject:SetActive(false) else if not self.proList[index][i] then diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua index c72ce11454..79b045bad3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua @@ -63,8 +63,8 @@ function LikeabilityPopup:UpdateTopLayoutPanel() self:UpDataProList(lv) function LikeabilityPopup:UpDataProList(lv) - local pro1 = LikabilityManager:GetViewProData(1,-1,lv,"总好感度属性:","","全体%s\n全体%s","",nil) - local pro2 = LikabilityManager:GetViewProData(1,lv,lv,"当前等级加成:","%s级","属性加成:%s %s","特权加成:%s",nil) + local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"总好感度属性:","","全体%s\n全体%s","",nil) + local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"当前等级加成:","%s级","属性加成:%s %s","特权加成:%s",nil) for i = 1,#self.proList do self.proList[i].go.gameObject:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua b/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua index 9ab8778f53..7c0c12ddda 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua @@ -68,7 +68,7 @@ function RoleLikeabilityPopup:UpdateTopLayoutPanel() end function RoleLikeabilityPopup:UpDataProList(lv) - local pro2 = LikabilityManager:GetViewProData(1,lv,lv,"","好感度%s级(%s/%s)",""..self.curheroData.ReadingName.." %s %s","特权加成:%s",nil) + local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"","好感度%s级(%s/%s)",""..self.curheroData.ReadingName.." %s %s","特权加成:%s",nil) for i = 1,#self.proList do self.proList[i].go.gameObject:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 54b9df5952..746d877bda 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -112,7 +112,7 @@ function RoleListPanel:BindEvent() end) Util.AddClick(this.haogandu, function() - UIManager.OpenPanel(UIName.LikeAbilityPanel, FORMATION_TYPE.SAVE_FORMATION) + UIManager.OpenPanel(UIName.LikeAbilityPanel) -- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.LikeAbility) then -- UIManager.OpenPanel(UIName.LikeAbilityPanel, FORMATION_TYPE.SAVE_FORMATION) -- else @@ -178,7 +178,7 @@ function RoleListPanel:OnShow() -- 刷新一次编队战斗力 FormationManager.RefreshMainFormationPower() - this.haogandu.gameObject:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.LikeAbility)) + this.haogandu.gameObject:SetActive(true)--ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.LikeAbility)) end --组合当前选项数据