diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab index 027326076b..d5333af31c 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab @@ -261,9 +261,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -96.5, y: 102} - m_SizeDelta: {x: 192.56, y: 198.4} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 102} + m_SizeDelta: {x: 157, y: 157} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &1413613903085751071 CanvasRenderer: m_ObjectHideFlags: 0 @@ -437,9 +437,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -96.5, y: 274} - m_SizeDelta: {x: 204.30005, y: 204.80005} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 274} + m_SizeDelta: {x: 157, y: 157} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &4135402267877091583 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5327,7 +5327,7 @@ ParticleSystem: --- !u!199 &1397471074226472267 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -6016,7 +6016,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.00001049, y: -0.0000038147} + m_AnchoredPosition: {x: 0.0000076293945, y: -0.0000038147} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4281545002021382535 @@ -10833,7 +10833,7 @@ ParticleSystem: --- !u!199 &4134560543265343287 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11097,7 +11097,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: -100, z: 0} initFloat: 0 @@ -15930,7 +15929,7 @@ ParticleSystem: --- !u!199 &497846283403455051 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20884,7 +20883,7 @@ ParticleSystem: --- !u!199 &1755391511871408359 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25720,7 +25719,7 @@ ParticleSystem: --- !u!199 &8187472554774414778 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26612,7 +26611,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: 0, z: 0} initFloat: 0 @@ -26898,7 +26896,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: 0, z: 0} initFloat: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index b5b6a62057..a78ce33ca0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -388,7 +388,7 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i BattleLogic.Event:DispatchEvent(BattleEventName.HitMiss, atkRole, defRole, skill) atkRole.Event:DispatchEvent(BattleEventName.HitMiss, defRole, skill) defRole.Event:DispatchEvent(BattleEventName.BeHitMiss, atkRole, skill) - return + return 0 end -- 如果是队伍技能,计算真实伤害,则damageType为伤害值 if atkRole.isTeam and not defRole:IsDead() then diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua index 046ee9506f..5c95de60a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua @@ -20,7 +20,6 @@ local dataType={ [2]=PRE_REWARD_POOL_TYPE.FRIEND, [3]=PRE_REWARD_POOL_TYPE.NORMAL, [4]=PRE_REWARD_POOL_TYPE.TIME_LIMITED, - [5]=PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP, } local itemList={} function HeroPreviewPanel:InitComponent() @@ -31,6 +30,7 @@ function HeroPreviewPanel:InitComponent() this.heroScroll=Util.GetGameObject(self.transform, "bg/heroScroll") this.heroScrollGrid=Util.GetGameObject(self.transform,"bg/heroScroll/grid") this.elementScroll=Util.GetGameObject(self.transform, "bg/elementScroll") + this.fiveGrid=Util.GetGameObject(self.transform, "bg/heroScroll/grid/fiveGrid") this.fourGrid=Util.GetGameObject(self.transform, "bg/heroScroll/grid/fourGrid") this.threeGrid=Util.GetGameObject(self.transform, "bg/heroScroll/grid/threeGrid") @@ -232,7 +232,7 @@ function this.SwitchView(index) end function this.starGridSwitch(index) - if index ==1 then + if index ==1 or index==4 then this.oneStarNum:SetActive(false) this.oneGrid:SetActive(false) this.twoStarNum:SetActive(false) diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index 5e0e6f4816..9f03597f6f 100644 Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ diff --git a/data_execl/base_data/LotteryRewardConfig.xlsx b/data_execl/base_data/LotteryRewardConfig.xlsx index 5c16ccf1b9..12d7fb31c5 100644 Binary files a/data_execl/base_data/LotteryRewardConfig.xlsx and b/data_execl/base_data/LotteryRewardConfig.xlsx differ diff --git a/data_execl/base_data/MonsterConfig.xlsx b/data_execl/base_data/MonsterConfig.xlsx index 8a1d2daf9a..ea673f7a98 100644 Binary files a/data_execl/base_data/MonsterConfig.xlsx and b/data_execl/base_data/MonsterConfig.xlsx differ diff --git a/data_execl/base_data/PrivilegeTypeConfig.xlsx b/data_execl/base_data/PrivilegeTypeConfig.xlsx index 809dc6ca09..f5785ec32c 100644 Binary files a/data_execl/base_data/PrivilegeTypeConfig.xlsx and b/data_execl/base_data/PrivilegeTypeConfig.xlsx differ diff --git a/data_execl/base_data/RewardGroup.xlsx b/data_execl/base_data/RewardGroup.xlsx index b7a407d7a8..6170911e15 100644 Binary files a/data_execl/base_data/RewardGroup.xlsx and b/data_execl/base_data/RewardGroup.xlsx differ diff --git a/data_execl/base_data/RewardItemConfig.xlsx b/data_execl/base_data/RewardItemConfig.xlsx index 42ea1a1434..93cd6a41e2 100644 Binary files a/data_execl/base_data/RewardItemConfig.xlsx and b/data_execl/base_data/RewardItemConfig.xlsx differ diff --git a/data_execl/base_data/StoreConfig.xlsx b/data_execl/base_data/StoreConfig.xlsx index 8d74b82472..4378441fbb 100644 Binary files a/data_execl/base_data/StoreConfig.xlsx and b/data_execl/base_data/StoreConfig.xlsx differ diff --git a/data_execl/base_data/StoreTypeConfig.xlsx b/data_execl/base_data/StoreTypeConfig.xlsx index ddb97e827e..579491b0dd 100644 Binary files a/data_execl/base_data/StoreTypeConfig.xlsx and b/data_execl/base_data/StoreTypeConfig.xlsx differ