diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index 28c9fdd5d1..8aabae8f26 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -464,10 +464,6 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg) data.hpList[i] = msg.remainHpList[i] end - -- 战前血量 - local oldHp = this.GetMapTotalBlood() - -- 战后血量 - local battledHp = 0 if msg.result == 0 then --战斗失败回城 @@ -478,7 +474,10 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg) -- 失败接受一下后端返回的位置 local lastPos = data.lastPos Game.GlobalEvent:DispatchEvent(GameEvent.Map.DeadOut, 0, lastPos) - battledHp = 0 + -- battledHp = 0 + + FormationManager.RefreshFormation(this.root.curFormationIndex,nil, + FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) else MapManager.RefreshFormationHp(data) Game.GlobalEvent:DispatchEvent(GameEvent.Map.ProgressChange, 2, 0, monsterGroupId) @@ -515,7 +514,7 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg) end end - battledHp = this.GetMapTotalBlood() + if this.difficulty == 1 or this.difficulty == 3 or this.difficulty == 4 then PopupText(strShow, 0.5, 2) @@ -531,7 +530,18 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg) end end - Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnMapTeamHpReduce, oldHp - battledHp) + -- 战前血量 + -- 战后血量 + if MapManager.curCarbonType ~= CarBonTypeId.ENDLESS then + LogYellow("更新血量会走这里吧") + local oldHp = this.GetMapTotalBlood() + local battledHp = 0 + battledHp = this.GetMapTotalBlood() + + Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnMapTeamHpReduce, oldHp - battledHp) + end + + end -- 判断某一类型副本得到的总星数 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua index 31d463c463..4d11437641 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua @@ -119,7 +119,7 @@ function this.On_Btn2_Click() this.EnterMapbyType(CarbonManager.difficulty, itemId) end else - LogGreen("进入的副本difficulty"..CarbonManager.difficulty.." itemId:"..tostring(itemId)) + LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId)) this.EnterMapbyType(CarbonManager.difficulty, itemId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua index a80af9de76..49bd847fc1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua @@ -152,7 +152,8 @@ function this.InitData(msg) --Log("msg.curXY : ".. msg.curXY) this.totalEnergy =0 - this.formationList = {} + -- this.formationList = {}--请滚 + --Log("服务器英雄数量 msg.heroInfos " .. #msg.heroInfos) -- for i=1, #msg.heroInfos do diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 63f9825eb0..d7ead081b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -51,6 +51,8 @@ function this:InitComponent() this.leftUp = Util.GetGameObject(self.gameObject, "leftUp") this.centerDonwn = Util.GetGameObject(self.gameObject, "centerDown") + this.endLessTitle = Util.GetGameObject(self.gameObject, "endLessTitle") + missionView.InitComponent(self.gameObject, this) playerView.InitComponent(self.gameObject, this) ctrlView.InitComponent(self.gameObject, this, playerView) @@ -179,6 +181,8 @@ function this:OnShow() endLessMapView.OnShow() pointHandleView.OnShow() trialPanel:OnShow() + this.endLessTitle:SetActive(MapManager.curCarbonType == CarBonTypeId.ENDLESS) + Util.GetGameObject(self.gameObject,"leftCenter"):SetActive(MapManager.curCarbonType ~= CarBonTypeId.ENDLESS) end --界面打开时调用(用于子类重写) @@ -285,23 +289,25 @@ function this.InitRolePosition(pos, curMapId) TileMapView.UpdateFunc() if MapManager.isOpen then - this.SetRoleShow(scale, pos) + this.SetRoleShow(scale, pos,1) end MapManager.stepList = {} end -- 设置小人落地 -function this.SetRoleShow(scale, pos) +function this.SetRoleShow(scale, pos,num) Log("this.SetRoleShow(scale, pos)") DoTween.To(DG.Tweening.Core.DOGetter_float(function () return TileMapView.GetMapMinScale() end), DG.Tweening.Core.DOSetter_float(TileMapController.SetScale), scale, 1):SetEase(Ease.Linear):OnComplete(function () -- this.Mask:SetActive(false) - playerView.Init(pos) + + playerView.Init(pos,num) -- 进图初始化完成 MapManager.FirstEnter = false + playerView.leader.transform:SetParent(ctrlView.Ctrl.transform) -- leader的父级设置为Ctrl后,Z轴的值发生了变化, 需要重新设置 local v3 = playerView.leader.transform.localPosition diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index 1c01fd8f52..ba649b26b1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -4,6 +4,7 @@ local this = ShowEnemyInfoPanel local monsterGroupId local _LiveName local _LiveNode +local MapPanel local trailConfig = ConfigManager.GetConfig(ConfigName.TrialConfig) local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) @@ -23,6 +24,7 @@ function this:InitComponent() this.e_level=Util.GetGameObject(this.root,"EnemyInfo/name/level/Text"):GetComponent("Text") this.e_cancelBtn=Util.GetGameObject(this.root,"EnemyInfo/cancelBtn") this.e_fightBtn=Util.GetGameObject(this.root,"EnemyInfo/fightBtn") + this.bottomBar=Util.GetGameObject(this.root,"EnemyInfo/bottomBar") this.heroGrid=Util.GetGameObject(this.root,"EnemyInfo/bottomBar/heroList") this.iconPre=Util.GetGameObject(this.root,"EnemyInfo/bottomBar/heroList/pre") end @@ -119,11 +121,11 @@ end function this:OnOpen(...) - monsterGroupId = ... + MapPanel,monsterGroupId = ... end function this:OnShow() - + this.bottomBar:SetActive(MapManager.curCarbonType ~= CarBonTypeId.ENDLESS) this.SetSelectHero() end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 3044e2f299..c7ecf4eea3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -599,7 +599,7 @@ end --显示敌人信息面板 function this.ShowEnemyInfo(_monsterGroupId,eventId,showValues) - UIManager.OpenPanel(UIName.ShowEnemyInfoPanel,_monsterGroupId) + UIManager.OpenPanel(UIName.ShowEnemyInfoPanel,MapPanel,_monsterGroupId) end function this.KillAllBitch() diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 5d7e895522..f235debe0b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -128,7 +128,7 @@ function this.OnOpen() this.InitBoolState() -- 开始探索请求 -- this.StartExplore() - MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos) + MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos,0) -- 设置任务显示 this.SetTipShow() -- 初始化行动力消耗的类型数值 @@ -206,7 +206,7 @@ end function this.SetTipShow() Log("MapManager.curMapId ========== " .. MapManager.curMapId) - if not this.IsEndLessMap() then return end + -- if not this.IsEndLessMap() then return end if not endLessData[MapManager.curMapId] then Log(Language[11286]) return end this.areaName.text = endLessData[MapManager.curMapId].Info EndLessMapManager.curMapName = endLessData[MapManager.curMapId].Info diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua index b8615500fd..56f2c0ca66 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua @@ -64,13 +64,16 @@ function this.RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Formation.OnMapTeamHpReduce, this.ReduceRoleHp) end -function this.Init(pos) +function this.Init(pos,num) local u, v = Map_Pos2UV(pos) --(角色身上的数据, 主要是位置信息) this.leaderMapData = TileMapView.GetMapData():GetMapData(u, v) MapManager.curMapBornPos = Map_UV2Pos(this.leaderMapData.u, this.leaderMapData.v) - this.InitRolePre(u, v) + LogRed("NUM"..num) + if num ==1 then + this.InitRolePre(u, v) + end SkeletonGraphic = Util.GetGameObject(this.leader, "root/ui/roleRoot/npc"):GetComponent("SkeletonGraphic") SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idleFunc SkeletonGraphic.AnimationState:SetAnimation(0, "lauch", false) diff --git a/data_execl/base_data/ActivityRewardConfig.xlsx b/data_execl/base_data/ActivityRewardConfig.xlsx index 70e4620089..ee920244e4 100644 Binary files a/data_execl/base_data/ActivityRewardConfig.xlsx and b/data_execl/base_data/ActivityRewardConfig.xlsx differ diff --git a/data_execl/base_data/ArtResourcesConfig.xlsx b/data_execl/base_data/ArtResourcesConfig.xlsx index d901ca3f35..102c526ed8 100644 Binary files a/data_execl/base_data/ArtResourcesConfig.xlsx and b/data_execl/base_data/ArtResourcesConfig.xlsx differ diff --git a/data_execl/base_data/BlessingConfig.xlsx b/data_execl/base_data/BlessingConfig.xlsx index 73ff13a319..b09d385cc8 100644 Binary files a/data_execl/base_data/BlessingConfig.xlsx and b/data_execl/base_data/BlessingConfig.xlsx differ diff --git a/data_execl/base_data/BlessingRewardPool.xlsx b/data_execl/base_data/BlessingRewardPool.xlsx index 42d77823a2..2786d57964 100644 Binary files a/data_execl/base_data/BlessingRewardPool.xlsx and b/data_execl/base_data/BlessingRewardPool.xlsx differ diff --git a/data_execl/base_data/EndlessMapConfig.xlsx b/data_execl/base_data/EndlessMapConfig.xlsx index ef56cbc05f..148f00ac43 100644 Binary files a/data_execl/base_data/EndlessMapConfig.xlsx and b/data_execl/base_data/EndlessMapConfig.xlsx differ diff --git a/data_execl/base_data/EquipConfig.xlsx b/data_execl/base_data/EquipConfig.xlsx index f390a0d165..1f8eea9b63 100644 Binary files a/data_execl/base_data/EquipConfig.xlsx and b/data_execl/base_data/EquipConfig.xlsx differ diff --git a/data_execl/base_data/EquipTalismana.xlsx b/data_execl/base_data/EquipTalismana.xlsx index 6a3f90ea05..76e59a9010 100644 Binary files a/data_execl/base_data/EquipTalismana.xlsx and b/data_execl/base_data/EquipTalismana.xlsx differ diff --git a/data_execl/base_data/ErrorCodeEerverConfig.xlsx b/data_execl/base_data/ErrorCodeEerverConfig.xlsx index cbc2f72d35..42f15db918 100644 Binary files a/data_execl/base_data/ErrorCodeEerverConfig.xlsx and b/data_execl/base_data/ErrorCodeEerverConfig.xlsx differ diff --git a/data_execl/base_data/EventPointConfig.xlsx b/data_execl/base_data/EventPointConfig.xlsx index e32807a3bc..0671b54097 100644 Binary files a/data_execl/base_data/EventPointConfig.xlsx and b/data_execl/base_data/EventPointConfig.xlsx differ diff --git a/data_execl/base_data/FoodsConfig.xlsx b/data_execl/base_data/FoodsConfig.xlsx index 03372d83cb..a9d6d2c3df 100644 Binary files a/data_execl/base_data/FoodsConfig.xlsx and b/data_execl/base_data/FoodsConfig.xlsx differ diff --git a/data_execl/base_data/GameSetting.xlsx b/data_execl/base_data/GameSetting.xlsx index fe564451f0..69818b35d7 100644 Binary files a/data_execl/base_data/GameSetting.xlsx and b/data_execl/base_data/GameSetting.xlsx differ diff --git a/data_execl/base_data/GlobalActivity.xlsx b/data_execl/base_data/GlobalActivity.xlsx index a49743a06a..d26f9100eb 100644 Binary files a/data_execl/base_data/GlobalActivity.xlsx and b/data_execl/base_data/GlobalActivity.xlsx differ diff --git a/data_execl/base_data/GlobalSystemConfig.xlsx b/data_execl/base_data/GlobalSystemConfig.xlsx index 559bf39174..e7d20f465f 100644 Binary files a/data_execl/base_data/GlobalSystemConfig.xlsx and b/data_execl/base_data/GlobalSystemConfig.xlsx differ diff --git a/data_execl/base_data/GuildCheckpointConfig.xlsx b/data_execl/base_data/GuildCheckpointConfig.xlsx new file mode 100644 index 0000000000..9d074593f5 Binary files /dev/null and b/data_execl/base_data/GuildCheckpointConfig.xlsx differ diff --git a/data_execl/base_data/HeroConfig.xlsx b/data_execl/base_data/HeroConfig.xlsx index 13c695f1e2..1202879886 100644 Binary files a/data_execl/base_data/HeroConfig.xlsx and b/data_execl/base_data/HeroConfig.xlsx differ diff --git a/data_execl/base_data/HeroRankupConfig.xlsx b/data_execl/base_data/HeroRankupConfig.xlsx index 738b71e69b..e3264be73f 100644 Binary files a/data_execl/base_data/HeroRankupConfig.xlsx and b/data_execl/base_data/HeroRankupConfig.xlsx differ diff --git a/data_execl/base_data/HeroSacrifice.xlsx b/data_execl/base_data/HeroSacrifice.xlsx index 762c534728..22393b097b 100644 Binary files a/data_execl/base_data/HeroSacrifice.xlsx and b/data_execl/base_data/HeroSacrifice.xlsx differ diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index aeb650084d..875570eebe 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/MapPointConfig.xlsx b/data_execl/base_data/MapPointConfig.xlsx index 29d99b4c0f..5ad6ce2e0a 100644 Binary files a/data_execl/base_data/MapPointConfig.xlsx and b/data_execl/base_data/MapPointConfig.xlsx differ diff --git a/data_execl/base_data/MonsterConfig.xlsx b/data_execl/base_data/MonsterConfig.xlsx index 43fedad207..2fbc3bf6f4 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/MonsterGroup.xlsx b/data_execl/base_data/MonsterGroup.xlsx index 5e44bcae1f..821d871966 100644 Binary files a/data_execl/base_data/MonsterGroup.xlsx and b/data_execl/base_data/MonsterGroup.xlsx differ diff --git a/data_execl/base_data/OptionConfig.xlsx b/data_execl/base_data/OptionConfig.xlsx index dff4bcf7bb..f92329023b 100644 Binary files a/data_execl/base_data/OptionConfig.xlsx and b/data_execl/base_data/OptionConfig.xlsx differ diff --git a/data_execl/base_data/PassiveSkillLogicConfig.xlsx b/data_execl/base_data/PassiveSkillLogicConfig.xlsx index 5de9c6e967..89136da42d 100644 Binary files a/data_execl/base_data/PassiveSkillLogicConfig.xlsx and b/data_execl/base_data/PassiveSkillLogicConfig.xlsx differ diff --git a/data_execl/base_data/PrivilegeTypeConfig.xlsx b/data_execl/base_data/PrivilegeTypeConfig.xlsx index 8ff998065a..ba5aae8998 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/QAConfig.xlsx b/data_execl/base_data/QAConfig.xlsx index 13ae807b8b..58fae2eadf 100644 Binary files a/data_execl/base_data/QAConfig.xlsx and b/data_execl/base_data/QAConfig.xlsx differ diff --git a/data_execl/base_data/RechargeCommodityConfig.xlsx b/data_execl/base_data/RechargeCommodityConfig.xlsx index d44eed82c2..af8a908b1e 100644 Binary files a/data_execl/base_data/RechargeCommodityConfig.xlsx and b/data_execl/base_data/RechargeCommodityConfig.xlsx differ diff --git a/data_execl/base_data/RecommendTeam.xlsx b/data_execl/base_data/RecommendTeam.xlsx index 0a43bbf644..50de948b03 100644 Binary files a/data_execl/base_data/RecommendTeam.xlsx and b/data_execl/base_data/RecommendTeam.xlsx differ diff --git a/data_execl/base_data/RewardGroup.xlsx b/data_execl/base_data/RewardGroup.xlsx index 5f7295369a..bf22206e99 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 282374cdd3..1b0f3b016c 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/RoleConfig.xlsx b/data_execl/base_data/RoleConfig.xlsx index fdca9eb842..9852ccb59c 100644 Binary files a/data_execl/base_data/RoleConfig.xlsx and b/data_execl/base_data/RoleConfig.xlsx differ diff --git a/data_execl/base_data/SkillConfig.xlsx b/data_execl/base_data/SkillConfig.xlsx index c4498e4d9b..00ecebb16d 100644 Binary files a/data_execl/base_data/SkillConfig.xlsx and b/data_execl/base_data/SkillConfig.xlsx differ diff --git a/data_execl/base_data/SpecialConfig.xlsx b/data_execl/base_data/SpecialConfig.xlsx index 27b63e7ae4..1075f7e5ad 100644 Binary files a/data_execl/base_data/SpecialConfig.xlsx and b/data_execl/base_data/SpecialConfig.xlsx differ diff --git a/data_execl/base_data/StoreConfig.xlsx b/data_execl/base_data/StoreConfig.xlsx index 2cdf286602..1e6c925ab4 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/TrialConfig.xlsx b/data_execl/base_data/TrialConfig.xlsx index c49ab040d1..74a841f344 100644 Binary files a/data_execl/base_data/TrialConfig.xlsx and b/data_execl/base_data/TrialConfig.xlsx differ diff --git a/data_execl/base_data/TrialSetting.xlsx b/data_execl/base_data/TrialSetting.xlsx index 25199f8a07..fdbd76b64f 100644 Binary files a/data_execl/base_data/TrialSetting.xlsx and b/data_execl/base_data/TrialSetting.xlsx differ diff --git a/data_execl/base_data/UIConfig.xlsx b/data_execl/base_data/UIConfig.xlsx index fe08714032..4b8317ffa0 100644 Binary files a/data_execl/base_data/UIConfig.xlsx and b/data_execl/base_data/UIConfig.xlsx differ