Commit Graph

442 Commits (efe1bdeab0add9b2e308a35ab9a70541cfc6b51f)

Author SHA1 Message Date
wangzhenxing ef40c02a3e 【战斗】=======战斗回合数显示修改 2021-02-19 17:04:56 +09:00
wangzhenxing ba4cc03dc1 [战斗]===========被动298修改,最大回合数显示修改 2021-02-19 16:47:06 +09:00
wangzhenxing 32b4e236a0 [战斗]=================去除没必要的特性被动修改 2021-02-05 17:00:34 +09:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +08:00
gaoxin 90bf24b3b0 Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/CourtesyDressPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
#	Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua
2021-02-05 14:30:05 +08:00
gaoxin 927025f6de 【本地化】中文字还原,合并用 2021-02-05 12:44:50 +08:00
gaoxin 5ce8497899 【本地化】中文字还原,合并用 2021-02-05 12:00:39 +08:00
wangzhenxing 44a0b80b84 【战斗】================不触发特性相关修改 2021-02-04 14:24:56 +09:00
wangzhenxing 693dffe4a3 [战斗]==================126效果修改 生命百分比伤害会被无敌盾挡住 2021-02-02 15:38:59 +08:00
wangzhenxing bc1691891d [战斗]==============禁疗显示血量 +0 2021-02-02 15:38:40 +08:00
wangzhenxing f699634c24 [战斗]==================126效果修改 生命百分比伤害会被无敌盾挡住 2021-02-02 15:02:25 +09:00
wangzhenxing d18c0fd8d4 [战斗]==============禁疗显示血量 +0 2021-02-01 19:15:19 +09:00
wangzhenxing 9c1c41c0fe 【战斗】===========被动294修改,添加免疫提示 2021-01-29 18:49:06 +09:00
wangzhenxing 64ddcde464 【战斗】=======被动294修改 2021-01-29 17:29:36 +09:00
wangzhenxing b3ac1b83c3 [战斗]==================被动119 ,294,305修改 2021-01-29 16:40:39 +09:00
wangzhenxing 2d1669246b 【战斗】===================选择两列逻辑修改提交 2021-01-28 20:24:50 +09:00
wangzhenxing 664d78d24d [战斗]=============被动新增305 ,被动303,262修改,战斗逻辑修改:如果有技能在释放,不检测轮转 2021-01-28 20:08:43 +09:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
ZhangBiao 15fd0a36cd Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-27 17:06:27 +08:00
ZhangBiao 9288003dd1 【牛转钱坤】【新将来袭】修改 2021-01-27 17:05:47 +08:00
wangzhenxing 3166601fc2 【战斗】===================被动138 被动301 效果126修改 2021-01-27 17:05:26 +09:00
wangzhenxing 4b5fa36d8e [战斗] ===========修改观音额外技能伤害类型修改,混乱后的普攻赋值,禁疗后显示治疗加0 2021-01-27 14:50:26 +09:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
wangzhenxing 3dfc48d652 Revert "【战斗】回滚27号版本不需要的内容"
This reverts commit 5dcf4d8040.
2021-01-26 17:38:48 +09:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
gaoxin cd40920949 【战斗】log打印添加结果数据 2021-01-22 17:45:01 +08:00
gaoxin 745646b06e 【战斗】添加获取各阵营伤害的接口 2021-01-22 16:19:40 +08:00
gaoxin 5dcf4d8040 【战斗】回滚27号版本不需要的内容 2021-01-22 16:19:13 +08:00
zhangqiang f44dcc20b7 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-01-22 15:29:46 +08:00
gaoxin 43965a452f 【战斗】上报日志结构修改,添加结果书v就 2021-01-22 12:20:53 +08:00
gaoxin 0899be29ba 【战斗】战斗异常上报数据添加战斗id字段,处理竞技场战斗不会上报数据的问题 2021-01-22 11:57:56 +08:00
wangzhenxing 33d0c7a2fd 【战斗】================增加304被动 2021-01-21 20:31:41 +09:00
wangzhenxing 94f31a58da 【战斗】========观音技能被动修改 2021-01-21 18:55:58 +09:00
wangzhenxing ecb47b16e8 [战斗]=========新将观音代码提交 2021-01-21 16:06:24 +09:00
ZhangBiao c76035f0e2 【新将来袭优化】优化BOSS血量百分比显示 2021-01-21 15:31:22 +08:00
wangzhenxing bf040e7544 新将观音提交 2021-01-20 16:08:44 +09:00
wangzhenxing 8327a4326c [战斗]======被动 137 修改 复活后血量显示修改 2021-01-18 17:27:30 +09:00
wangzhenxing ba6661c0f8 [战斗]========被动154修改 新增300被动 Hot 添加修改治疗量的接口,复活接口添加界面显示 2021-01-18 17:26:39 +09:00
wangzhenxing 95e15caa9a [战斗]======被动 137 修改 复活后血量显示修改 2021-01-18 17:13:51 +09:00
wangzhenxing b9479d8326 [战斗]========被动154修改 新增300被动 Hot 添加修改治疗量的接口,复活接口添加界面显示 2021-01-18 14:31:54 +09:00
wangzhenxing 72844ea7ab [战斗]========被动299 修改 2021-01-18 10:56:02 +09:00
wangzhenxing e84b6a962e [战斗] ========被动 299 154修改 2021-01-16 17:17:34 +09:00
gaoxin d1ed3121fa 【战斗统计】修复新统计,导致关卡报错 2021-01-16 17:01:54 +08:00
gaoxin ceb9e39b00 【战斗统计】第二版 2021-01-16 16:23:06 +08:00
gaoxin 6f386e1b52 【战斗统计】第一版 2021-01-16 16:22:57 +08:00
wangzhenxing 9a39e0edda [战斗]=========被动141 修改 2021-01-15 14:27:29 +09:00
wangzhenxing 4220257ea7 [战斗]=========第四期觉醒修改 2021-01-15 14:26:53 +09:00
wangzhenxing bc7cb4b96a [战斗]========== 第四期觉醒技能修改 2021-01-15 14:25:47 +09:00
gaoxin a121f5fd9c 【bug】修复灵兽假战斗属性为空的问题 2021-01-14 11:56:42 +08:00
wangzhenxing 2f08a5179e [战斗] ======被动244 修改,检测是否为boss方法修改 2021-01-12 23:06:28 +09:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin 13767fd26e Merge branch 'master_xma_local' into gx/xma_local 2021-01-12 10:56:36 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
wangzhenxing 4d210b9297 [战斗]===========118 124效果修改,百分比伤害对boss无效 2021-01-11 16:43:09 +09:00
wangzhenxing 64955313f6 [战斗]===========118 124效果修改,百分比伤害对boss无效 2021-01-11 16:20:17 +09:00
wangzhenxing 90750c9617 【战斗】============ 显示层伤害显示屏蔽小数 118,121效果去除小数 2021-01-09 15:34:00 +09:00
gaoxin 3ed952153c 【战斗】优化战斗结束后报错的问题 2021-01-09 15:27:55 +09:00
gaoxin 7ad4f0fe1b 【战斗】战斗开始技能报错,灵兽技能释放casting事件延长到2秒 2021-01-09 15:27:15 +09:00
wangzhenxing 8b72027fcb 【战斗】 ==========表现优化敌我方死亡后不显示加怒气的表现 2021-01-09 15:26:09 +09:00
wangzhenxing f1ada7ed8d [战斗]======前端战斗 英雄添加job数据 2021-01-09 15:25:17 +09:00
wangzhenxing ecc254550e [战斗]=========新增125效果 -- 目标[a]增加[b]%持续[c]回合,效果可叠加,[d]改变 2021-01-09 15:24:39 +09:00
wangzhenxing 6afeb8b41c 【战斗】===========新增124效果 造成目标[a]*[b]%的直接伤害 2021-01-09 15:23:33 +09:00
wangzhenxing 4828581d09 [战斗]=====灵兽金乌技能修改提交 2021-01-09 15:21:40 +09:00
wangzhenxing 04765e2d7a [战斗]====提交 麒麟印记,放逐类型 2021-01-09 15:20:20 +09:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
wangzhenxing 820eb65f8d [战斗]====添加5, 6 condition 判断条件 添加buff类型 麒麟印加 放逐 2021-01-09 15:17:56 +09:00
wangzhenxing 8dbafbee93 【战斗】============ 显示层伤害显示屏蔽小数 118,121效果去除小数 2021-01-09 15:06:00 +09:00
gaoxin 70a771db27 【战斗】优化战斗结束后报错的问题 2021-01-09 10:59:50 +08:00
gaoxin 7ae81ae694 【战斗】战斗开始技能报错,灵兽技能释放casting事件延长到2秒 2021-01-09 10:58:15 +08:00
zhangqiang bd14d812a3 【战斗回放】bug 2021-01-08 19:23:31 +08:00
zhangqiang e12211eee4 【战斗回放】代码整理 2021-01-08 19:22:16 +08:00
zhangqiang 41ffad0c78 【战斗回放】车迟 十绝阵 2021-01-08 19:20:07 +08:00
zhangqiang 9f9b2920e3 【战斗回放】 2021-01-08 19:19:01 +08:00
wangzhenxing f28ad49f3d 【战斗】 ==========表现优化敌我方死亡后不显示加怒气的表现 2021-01-08 19:51:26 +09:00
wangzhenxing fce7a7ec32 [战斗]======前端战斗 英雄添加job数据 2021-01-08 19:19:25 +09:00
wangzhenxing 40be6b55d2 [战斗]=========新增125效果 -- 目标[a]增加[b]%持续[c]回合,效果可叠加,[d]改变 2021-01-08 18:15:28 +09:00
wangzhenxing 503be01f18 【战斗】===========新增124效果 造成目标[a]*[b]%的直接伤害 2021-01-08 17:36:03 +09:00
wangzhenxing 6d86795403 [战斗]=====灵兽金乌技能修改提交 2021-01-08 16:36:55 +09:00
wangzhenxing 91531e00b0 [战斗]====提交 麒麟印记,放逐类型 2021-01-08 16:35:52 +09:00
wangzhenxing 8ce40e8099 [战斗]====添加5, 6 condition 判断条件 添加buff类型 麒麟印加 放逐 2021-01-08 16:34:42 +09:00
zhangqiang ecbde627e4 【战斗回放】bug 2021-01-07 18:03:57 +08:00
zhangqiang 1ef5728daf 【战斗回放】代码整理 2021-01-07 11:32:26 +08:00
zhangqiang 9cf814590a 【战斗回放】车迟 十绝阵 2021-01-06 21:04:37 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
wangzhenxing 4571f9e5a5 [战斗] 不灭buff更新修改提交 2020-12-28 12:11:03 +09:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
wangzhenxing ed9efaf4e8 【战斗】 白骨精追加普攻必定暴击修改 2020-12-26 19:54:46 +09:00
wangzhenxing fcc8724fca 【战斗】=====292被动位置修改 2020-12-26 19:52:51 +09:00
wangzhenxing 4bc92b8b21 [战斗]白骨精法宝添加普攻不触发任何特性 2020-12-26 19:49:45 +09:00
wangzhenxing e9c4cab292 [战斗]289被动修改,协议数据提交 2020-12-26 19:48:59 +09:00
wangzhenxing f07b8a14d2 [战斗]修改切磋判断胜负条件 2020-12-26 19:46:18 +09:00
wangzhenxing 8ad04c122c [优化] 巅峰争霸赛,切磋超时改为只判断总伤害,不再判断总治疗 2020-12-26 19:36:11 +09:00
wangzhenxing f0c2913433 [战斗] 修改初始怒气无法增加修改 2020-12-26 19:29:44 +09:00
wangzhenxing 064e00c029 [战斗]白骨精技能,被动,魂印效果提交 2020-12-26 19:28:29 +09:00
gaoxin 7fe3b4f39f 【战斗】魂印力战之躯不再免疫间接伤害 2020-12-26 18:34:02 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
gaoxin ec47ec2b1c 【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据 2020-12-18 16:51:28 +08:00
gaoxin ef1ced3ef7 【战报系统】基础功能添加 2020-12-18 16:51:13 +08:00
wangzhenxing 3a1bbf7cac 【战斗】 188被动修改 间接伤害不会被义结金兰分摊 2020-12-18 11:23:41 +09:00
wangzhenxing c4320e59e2 【战斗】 142被动效果修改 间接伤害不会触发回血 2020-12-18 11:22:58 +09:00
wangzhenxing 2dd63c7986 [战斗]284效果修改,非技能伤害不会回血 2020-12-18 11:22:24 +09:00
wangzhenxing 297b36eb2b [战斗] 链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害 ,舍身济世伤害不触发284被动 2020-12-18 11:21:10 +09:00
gaoxin f4096cb18b 【战斗】v1.0.11
1、修复圣物效果数据错误
 2、不灭buff实现方式修改
 3、灵兽buff回合计算方式修改
2020-12-16 11:36:29 +08:00
wangzhenxing 9f4d3cd182 [战斗] 大闹天宫圣物相关被动,同步成和校验服一样 2020-12-12 17:58:37 +09:00
gaoxin ec3636c842 【战斗】检测不灭的方式修改 2020-12-12 16:59:15 +09:00
wangzhenxing b9a112736b [战斗] 修改灵兽给英雄附加的buff的刷新机制,改为大回合刷新,如果灵兽是在回合后释放,配置的持续回合数+1 2020-12-07 18:03:23 +09:00
zhangqiang 62fcc1fa19 【战斗 】 给英雄附加战斗单位类型 2020-12-07 18:02:49 +09:00
wangzhenxing 7da566dc76 [战斗] 神女庇佑最佳技能表现修改,吞鲸魂印修改 2020-12-07 18:01:57 +09:00
ZhangBiao 1fcb892050 【新将来袭】宝箱位置调整 2020-12-04 19:42:47 +08:00
ZhangBiao b3e374e336 【神将来袭】基本完事儿 2020-12-03 18:36:01 +08:00
ZhangBiao b2e53f8ae5 【新将来袭】战斗血条 2020-12-03 15:11:24 +08:00
ZhangBiao 86d190572a 【神将来袭】加战斗了 2020-12-02 17:14:52 +08:00
gaoxin 4dbbbc7929 【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错 2020-11-30 20:35:14 +08:00
wangzhenxing a711c30c64 [战斗] 99被动修改 屏蔽金翅大鹏不灭 2020-11-28 17:59:38 +09:00
wangzhenxing 30f953f6de 【战斗】 角色查找逻辑添加 排除拥有不灭的单位 和 没有不灭的无序列表 103效果改成治疗随机多个单位 276被动 改为给随机英雄加 2020-11-28 17:58:36 +09:00
wangzhenxing ce8c206717 【战斗】效果:103修改添加1个参数 被动 147 206修改 被动添加271-284 2020-11-28 17:56:58 +09:00
wangzhenxing 4b6578e957 [战斗] 91 112 115 196 256 被动添加特性屏蔽修改 2020-11-24 11:31:02 +09:00
wangzhenxing 2cc096cd18 【战斗】147,206被动修改回原来的效果 2020-11-24 11:24:29 +09:00
wangzhenxing e3e609c87e [战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题 2020-11-24 11:23:31 +09:00
gaoxin 34ae0ed497 【战斗】无用log删除,技能数量限制初始化数据位置错误 2020-11-23 21:36:34 +08:00
gaoxin 5e4f1a5165 v1.0.7
1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题
2020-11-23 10:08:36 +08:00
gaoxin 85a608d21a Revert "Revert "【战斗】v1.0.5""
This reverts commit 941cb86845.
2020-11-20 15:15:45 +08:00
gaoxin 941cb86845 Revert "【战斗】v1.0.5"
This reverts commit 0548b16015.
2020-11-20 15:07:27 +08:00
gaoxin 2331c8d013 【战斗】添加超时检测 2020-11-20 15:07:08 +08:00
gaoxin 0548b16015 【战斗】v1.0.5
1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限
2020-11-20 14:27:23 +08:00
gaoxin 37631ebc67 【战斗】技能特效播放层级修改 2020-11-19 15:44:23 +08:00
gaoxin 59937a1132 【战斗】修改自动下落特效的时间为表配置 2020-11-19 14:53:45 +08:00
gaoxin ca1a509cb8 【战斗】修复资源回收顺序错误导致跳过战斗时黑屏的问题 2020-11-17 21:40:36 +08:00
gaoxin 4eb60838b4 【战斗】修复被动112参数错误 2020-11-17 20:39:28 +08:00
wangzhenxing 84a28f8a28 [战斗] 196 被动 添加类型判断 2020-11-17 18:44:31 +09:00
gaoxin be0195af18 【战斗】战斗表现添加射线类型特凶啊 2020-11-17 18:31:11 +08:00
gaoxin 05076eb743 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-17 18:30:45 +08:00
gaoxin d3a276cdca 【测试战斗】皮肤加入本地数据保存 2020-11-17 18:30:37 +08:00
wangzhenxing 3308ce4479 [战斗] 被动处理 舍身济世200 ,及伏虎罗汉特性被动添加额外技能屏蔽 2020-11-17 17:35:25 +09:00
gaoxin 6a515c2374 【战斗】优化战斗资源回收机制,修复跳过战斗时灵兽报错 2020-11-17 14:05:46 +08:00
gaoxin 8f3325ad5f 【战斗】修复灵兽释放技能时跳过战斗,下次战斗会显示上次战斗的casting的问题 2020-11-17 14:04:23 +08:00
wangzhenxing 383f20aa32 【战斗】 被动266去除无用log 2020-11-17 10:02:29 +09:00
gaoxin 46750846f8 【战斗】修复灵兽技能释放后会检测轮数,导致战斗卡死的问题。 2020-11-16 18:34:12 +08:00
ZhangBiao 8df6de20e5 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00
gaoxin 5301a91738 【战斗】修复被动270普通攻击也能触发的问题 2020-11-16 14:04:58 +08:00
gaoxin 8edf7dd781 【战斗】被动添加
270:技能直接伤害[a]%转化为生命治疗自己
2020-11-16 11:50:38 +08:00
wangzhenxing 1287453f10 【战斗】 额外技能添加5技能 2020-11-14 20:20:06 +09:00
wangzhenxing 406cf2e1f7 【战斗】 被动265效果修改 2020-11-14 19:52:47 +09:00
wangzhenxing b1549b470b [战斗] 被动268修改 2020-11-14 19:20:55 +09:00
gaoxin af915fb480 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-14 17:37:42 +08:00
gaoxin ede48e5063 【测试战斗】添加总伤害数值打印 2020-11-14 17:37:24 +08:00
gaoxin e6ac0a8845 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-14 17:20:38 +08:00