From 7c2598c7e7829e78362904bf71c943a5143c11db Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 19 Apr 2023 17:49:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=B1=9E=E6=80=A7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E7=A9=BA=E8=8B=B1=E9=9B=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua | 13 ++++++++++--- .../~Lua/Modules/Battle/Logic/Role/RoleData.lua | 4 ++-- .../~Lua/Modules/Battle/View/Unit/EnemyView.lua | 4 ++-- .../~Lua/Modules/Battle/View/Unit/MonsterView.lua | 4 ++-- .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 11 +++++++++-- .../~Lua/Modules/Battle/View/Unit/RoleView.lua | 4 ++-- .../~Lua/Modules/Battle/View/Unit/WeaponView.lua | 2 +- .../~Lua/Modules/Likability/LikeAbilityPanel.lua | 1 + 8 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 0bb07b665c..364619c471 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -238,6 +238,8 @@ RoleDataName = { DaoReduce = indexAdd(), --道系伤害减免 CritDamageReduce = indexAdd(), --暴击伤害减免 InitRage = indexAdd(), --初始怒气值 + KongBonus = indexAdd(), --时空系伤害加成 + KongReduce = indexAdd(), --时空系伤害减免 } -- 战斗表属性id对应战斗中属性数据 @@ -266,6 +268,8 @@ BattlePropList = { RoleDataName.FoReduce, RoleDataName.YaoReduce, RoleDataName.DaoReduce, + RoleDataName.KongBonus, + RoleDataName.KongReduce, RoleDataName.CritDamageReduce, } @@ -388,7 +392,8 @@ BattleRoleElementType = { REN = 1, FO = 2, YAO = 3, - DAO = 4 + DAO = 4, + Kong = 5, } BattleArtFontType = { @@ -406,11 +411,13 @@ BattleMieProp = { [BattleRoleElementType.REN] = RoleDataName.RenBonus, [BattleRoleElementType.FO] = RoleDataName.FoBonus, [BattleRoleElementType.YAO] = RoleDataName.YaoBonus, - [BattleRoleElementType.DAO] = RoleDataName.DaoBonus + [BattleRoleElementType.DAO] = RoleDataName.DaoBonus, + [BattleRoleElementType.Kong] = RoleDataName.KongBonus } BattleKangProp = { [BattleRoleElementType.REN] = RoleDataName.RenReduce, [BattleRoleElementType.FO] = RoleDataName.FoReduce, [BattleRoleElementType.YAO] = RoleDataName.YaoReduce, - [BattleRoleElementType.DAO] = RoleDataName.DaoReduce + [BattleRoleElementType.DAO] = RoleDataName.DaoReduce, + [BattleRoleElementType.Kong] = RoleDataName.KongReduce } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua index 0b3514f937..298531f3d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua @@ -7,8 +7,8 @@ local function isFactor(name) end function RoleData.New() - local instance = {role=0, data={0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0}, - orginData={0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0}} + local instance = {role=0, data={0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0}, + orginData={0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0}} setmetatable(instance, RoleData) return instance end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 4a86281230..f20400192a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -199,7 +199,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.URoleProperty = URoleProperty self.URoleProperty.uid = role.uid role.data:Foreach(function (name, value) - self.URoleProperty:AddProperty(name, value) + --self.URoleProperty:AddProperty(name, value) end) end @@ -313,7 +313,7 @@ function EnemyView:Update() if IsOpenBattleDebug then self.role.data:Foreach(function (name, value) - self.URoleProperty:SetValue(name, value) + --self.URoleProperty:SetValue(name, value) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua index 2926430d43..9a3002cef2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua @@ -107,7 +107,7 @@ function MonsterView:onCreate(go, role, position, root) self.URoleProperty = URoleProperty self.URoleProperty.uid = role.uid role.data:Foreach(function (name, value) - self.URoleProperty:AddProperty(name, value) + --self.URoleProperty:AddProperty(name, value) end) end self.combat=nil @@ -121,7 +121,7 @@ end function MonsterView:Update() if IsOpenBattleDebug then self.role.data:Foreach(function (name, value) - self.URoleProperty:SetValue(name, value) + --self.URoleProperty:SetValue(name, value) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 4746bf7def..6fb16a7404 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -257,8 +257,15 @@ function PlayerView:onCreate(go, role, position, root) end self.URoleProperty = URoleProperty self.URoleProperty.uid = role.uid + + -- local bbb={} + -- bbb=self.URoleProperty:GetNames() + -- --LogError("# aaa len=="..#bbb) + -- for key, value in pairs(bbb) do + -- LogError("# aaa i=="..value) + -- end role.data:Foreach(function (name, value) - self.URoleProperty:AddProperty(name, value) + --self.URoleProperty:AddProperty(name, value) end) end @@ -366,7 +373,7 @@ function PlayerView:Update() if IsOpenBattleDebug then self.role.data:Foreach(function (name, value) - self.URoleProperty:SetValue(name, value) + --self.URoleProperty:SetValue(name, value) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua index d48314c246..344fa4097e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua @@ -195,7 +195,7 @@ function RoleView:onCreate(go, role, position, root) self.URoleProperty = URoleProperty self.URoleProperty.uid = role.uid role.data:Foreach(function (name, value) - self.URoleProperty:AddProperty(name, value) + --self.URoleProperty:AddProperty(name, value) end) end @@ -294,7 +294,7 @@ function RoleView:Update() if IsOpenBattleDebug then self.role.data:Foreach(function (name, value) - self.URoleProperty:SetValue(name, value) + --self.URoleProperty:SetValue(name, value) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua index 4cb377c03b..854a3968ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua @@ -117,7 +117,7 @@ end function WeaponView:Update() if IsOpenBattleDebug then self.role.data:Foreach(function (name, value) - self.URoleProperty:SetValue(name, value) + --self.URoleProperty:SetValue(name, value) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua index 8beb5d1f6e..c39f7b6203 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua @@ -29,6 +29,7 @@ function LikeAbilityPanel:InitComponent() if tabsImg[i + 1] then Util.GetGameObject(tabs[i], "Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(tabsImg[i + 1]) end + tabs[i]:SetActive(true) end self.selectBtn = Util.GetGameObject(self.btnPrant, "selectBtn")