gaoxin
|
8eb6c30d95
|
【战斗】战斗开始时清除轮转方法,(伏虎罗汉无限攻击的bug)
|
2021-04-15 19:05:01 +08:00 |
wangzhenxing
|
450e2b412b
|
[战斗]==================同步最新被动逻辑
|
2021-04-10 21:58:27 +08:00 |
JieLing
|
ea7282bbbb
|
Merge branch 'xma/dev' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-04-10 17:23:38 +08:00 |
wangzhenxing
|
d19f1cce1c
|
[战斗]=====被动214,238修改 bug:1014491 1013881
|
2021-04-08 21:09:29 +08:00 |
wangzhenxing
|
dada859ec6
|
[战斗]========battleutil 添加判断数组长度方法
|
2021-04-07 20:14:43 +08:00 |
gaoxin
|
1a4c96e88d
|
Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Framework/Framework.lua
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
# Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# data_execl/Language_data/LanguageLua.csv
# data_execl/Language_data/LanguageText.csv
|
2021-04-02 11:34:27 +08:00 |
wangzhenxing
|
acfe38c973
|
[战斗]==========被动263 被动168修改
|
2021-04-01 17:11:54 +08:00 |
wangzhenxing
|
1a3086a2e3
|
【战斗】==============被动168 修改 bugId: 1014123
|
2021-03-30 20:33:39 +08:00 |
wangzhenxing
|
33852141c6
|
【战斗】============被动245 去除 是不是追加技能得判断
|
2021-03-30 17:27:37 +08:00 |
wangzhenxing
|
cda352d46e
|
【战斗】==========选择对位目标逻辑修改
|
2021-03-30 17:17:10 +08:00 |
wangzhenxing
|
2e886d4524
|
【战斗】====清除盾效果添加破盾提示文字,清除免疫,持续伤害,控制效果添加清除提示;被动278修改;被动添加排序;控制效果结束修改
|
2021-03-30 16:34:17 +08:00 |
wangzhenxing
|
27e4ab6e1a
|
[战斗]============= 获取数组的长度方法修改
|
2021-03-30 11:08:55 +08:00 |
JieLing
|
f81e8ecaab
|
Merge branch 'xma/dev' into master_xma_local
|
2021-03-29 23:34:12 +08:00 |
wangzhenxing
|
f497a63e73
|
[战斗]====================放逐添加表现
|
2021-03-27 20:22:14 +08:00 |
JieLing
|
80b9b48367
|
【合并多余修改回滚】
|
2021-03-27 17:35:13 +08:00 |
JieLing
|
857d0112fa
|
Merge branch 'xma/dev' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-03-27 17:11:57 +08:00 |
wangzhenxing
|
9101433578
|
【战斗】==============链接符显示修改,链接符放逐修改,灵兽无目标修改
|
2021-03-27 12:37:50 +08:00 |
wangzhenxing
|
19d7914e78
|
【战斗】=======解决放逐目标有不灭不会被选中;解决只剩放逐目标攻击动画异常问题
|
2021-03-26 16:50:49 +08:00 |
wangzhenxing
|
19af51d38f
|
[战斗]========= 放逐后的buff刷新修改,放逐后的被动触发屏蔽,控制类buff 叠层逻辑修改
|
2021-03-26 14:40:23 +08:00 |
wangzhenxing
|
f5a85c4d2e
|
【战斗】===================== 灵兽释放技能逻辑修改, rolemanager 添加获取role接口
|
2021-03-25 15:54:12 +08:00 |
wangzhenxing
|
8f1d56cf8f
|
[战斗]==============灵兽每回合释放技能次数 刷新修改
|
2021-03-25 09:57:51 +08:00 |
wangzhenxing
|
21be2f29dd
|
[战斗]==============添加效果127 任务初始化时被动排序
|
2021-03-24 16:50:55 +08:00 |
wangzhenxing
|
d0a7ef39ca
|
【战斗】=============添加新灵兽技能逻辑 放逐和麒麟印记
|
2021-03-23 20:41:44 +08:00 |
wangzhenxing
|
433a6b243c
|
[战斗]=============被动191修改,buff图标叠加添加免疫和连接符
|
2021-03-17 16:45:26 +08:00 |
wangzhenxing
|
7d576d8c0c
|
[战斗]=============被动225修改 增加最大血量客户端特殊处理
|
2021-03-17 16:43:28 +08:00 |
wangzhenxing
|
5fde5a4473
|
[战斗]=============被动191修改,buff图标叠加添加免疫和连接符
|
2021-03-16 20:25:24 +08:00 |
wangzhenxing
|
15ce997282
|
[战斗]=============被动225修改 增加最大血量客户端特殊处理
|
2021-03-16 15:56:10 +08:00 |
wangzhenxing
|
d1f4aae4cd
|
Revert "Revert "[战斗]==============249修改""
This reverts commit 7a8de27f1c .
|
2021-03-16 10:43:12 +08:00 |
ZhangBiao
|
1b06ae40c9
|
【battlelogic】增加log
|
2021-03-15 17:11:52 +08:00 |
wangzhenxing
|
0ed597648a
|
[战斗]========= buff 叠层表现修改
|
2021-03-13 16:42:24 +08:00 |
JieLing
|
0bae1d524b
|
【回滚提交】1
|
2021-03-13 16:41:06 +08:00 |
JieLing
|
054d6cba54
|
Revert "[战斗]=============272被动修改 根据配置回合数开始计算概率"
This reverts commit 130a7d6548 .
|
2021-03-13 16:39:02 +08:00 |
JieLing
|
7a8de27f1c
|
Revert "[战斗]==============249修改"
This reverts commit b67d6485c9 .
|
2021-03-13 16:38:43 +08:00 |
JieLing
|
be28abd54c
|
Revert "[战斗]========= buff 叠层表现修改"
This reverts commit 491a6f311a .
|
2021-03-13 16:35:35 +08:00 |
wangzhenxing
|
491a6f311a
|
[战斗]========= buff 叠层表现修改
|
2021-03-12 11:04:06 +08:00 |
jiaoyangna
|
4121f24a27
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2021-03-10 13:50:38 +08:00 |
wangzhenxing
|
b67d6485c9
|
[战斗]==============249修改
|
2021-03-08 18:07:13 +08:00 |
wangzhenxing
|
130a7d6548
|
[战斗]=============272被动修改 根据配置回合数开始计算概率
|
2021-03-05 18:02:31 +09:00 |
wangzhenxing
|
74ebe19f74
|
[战斗]====================大闹天宫圣物修改提交
|
2021-03-05 16:26:50 +09:00 |
jiaoyangna
|
bdb47125a6
|
Merge branch 'local_to_dev' into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.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/CarbonScoreSortPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.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/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/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.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/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.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/GuildMemberInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.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/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.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/PlayerInfoPopup.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/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/Resolve/View/Resolve_Dismantle.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.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/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/ItemView.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
# FontArt/ArtFont_zh/hongmengzhen_zh.png
# FontArt/ArtFont_zh/jianmushenshu_zh.png
# FontArt/ArtFont_zh/silingshilian_zh.png
|
2021-03-02 16:44:38 +08:00 |
jiaoyangna
|
fcc02e4875
|
lua 提交
|
2021-03-02 15:59:29 +08:00 |
gaoxin
|
6faa7a29ae
|
Merge branch '0功能/周版本优化0303' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-02-27 17:32:37 +08:00 |
gaoxin
|
1ca6517454
|
Merge commit '0bd2c53e6c38b87ace2ab14a979a56362d35fc7e' into 0功能/周版本优化0303
|
2021-02-27 17:31:09 +08:00 |
wangzhenxing
|
7e80c71111
|
[战斗]===========合并local修改的观音追击导致报错
|
2021-02-27 18:30:11 +09:00 |
zhangqiang
|
73d50e9777
|
Merge branch '0功能/周版本优化0303' into master_xma_local
|
2021-02-27 16:55:47 +08:00 |
wangzhenxing
|
55972b70d7
|
【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻
|
2021-02-27 16:52:12 +08:00 |
wangzhenxing
|
9362f341a6
|
[战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻
|
2021-02-27 16:52:06 +08:00 |
wangzhenxing
|
f7d040f29b
|
Merge branch '0功能/本周版本优化内容' into 0功能/本周版本优化内容_battle
|
2021-02-27 15:14:59 +09:00 |
wangzhenxing
|
0bd2c53e6c
|
【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻
|
2021-02-26 18:19:54 +09:00 |
wangzhenxing
|
7ae746b318
|
[战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻
|
2021-02-26 17:00:05 +09:00 |
wangzhenxing
|
0e23ca3cf8
|
[战斗]======= 2021-0303发布计划 战斗修改
|
2021-02-25 19:48:24 +09:00 |
gaoxin
|
bb68af637a
|
【战斗】修复孙悟空和观音菩萨同时死亡导致报错的问题
|
2021-02-24 17:02:31 +08:00 |
wangzhenxing
|
da1aa31b3d
|
[战斗]=============混乱普攻逻辑修改
|
2021-02-23 17:03:10 +09:00 |
ZhangBiao
|
0382600bb8
|
【boss详情】战斗中断完成,该创建新界面
|
2021-02-22 16:59:55 +08:00 |
jiaoyangna
|
a05694855c
|
Merge branch 'local_to_xmadev' into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.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/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.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/Compound/view/CompoundPanel_SoulPrint.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/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/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.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/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.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/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.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/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/Resolve/View/Resolve_Dismantle.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.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/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-20 17:55:52 +08:00 |
jiaoyangna
|
629971d137
|
文本还原提交
|
2021-02-20 16:55:28 +08:00 |
wangzhenxing
|
ba4cc03dc1
|
[战斗]===========被动298修改,最大回合数显示修改
|
2021-02-19 16:47:06 +09:00 |
wangzhenxing
|
32b4e236a0
|
[战斗]=================去除没必要的特性被动修改
|
2021-02-05 17:00:34 +09: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
|
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 |
wangzhenxing
|
3166601fc2
|
【战斗】===================被动138 被动301 效果126修改
|
2021-01-27 17:05:26 +09:00 |
wangzhenxing
|
4b5fa36d8e
|
[战斗] ===========修改观音额外技能伤害类型修改,混乱后的普攻赋值,禁疗后显示治疗加0
|
2021-01-27 14:50:26 +09:00 |
wangzhenxing
|
3dfc48d652
|
Revert "【战斗】回滚27号版本不需要的内容"
This reverts commit 5dcf4d8040 .
|
2021-01-26 17:38:48 +09: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
|
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 |
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 |
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
|
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 |
wangzhenxing
|
2f08a5179e
|
[战斗] ======被动244 修改,检测是否为boss方法修改
|
2021-01-12 23:06:28 +09: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 |
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 |
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 |
wangzhenxing
|
4571f9e5a5
|
[战斗] 不灭buff更新修改提交
|
2020-12-28 12:11:03 +09: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 |
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 |
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
|
4eb60838b4
|
【战斗】修复被动112参数错误
|
2020-11-17 20:39:28 +08:00 |
wangzhenxing
|
84a28f8a28
|
[战斗] 196 被动 添加类型判断
|
2020-11-17 18:44:31 +09:00 |
wangzhenxing
|
3308ce4479
|
[战斗] 被动处理 舍身济世200 ,及伏虎罗汉特性被动添加额外技能屏蔽
|
2020-11-17 17:35:25 +09:00 |
wangzhenxing
|
383f20aa32
|
【战斗】 被动266去除无用log
|
2020-11-17 10:02:29 +09:00 |
gaoxin
|
46750846f8
|
【战斗】修复灵兽技能释放后会检测轮数,导致战斗卡死的问题。
|
2020-11-16 18:34:12 +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 |
wangzhenxing
|
d64ed5e92d
|
[战斗] 268 被动效果修改
|
2020-11-14 17:32:09 +09:00 |
wangzhenxing
|
5e0384b847
|
[战斗]免疫盾修改提交
|
2020-11-14 17:13:37 +09:00 |
wangzhenxing
|
6821324fb1
|
[战斗]减伤盾效果修改提交
|
2020-11-14 15:43:40 +09:00 |
wangzhenxing
|
deb8603b98
|
[战斗]减伤盾效果修改
|
2020-11-14 15:11:32 +09:00 |
gaoxin
|
142d8dee0f
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 19:38:10 +08:00 |
gaoxin
|
56afe786be
|
【战斗】战斗关闭时不再回收灵兽立绘资源,直接销毁,避免在UI上立绘不停播放攻击动作的问题
|
2020-11-13 19:38:04 +08:00 |
gaoxin
|
1face65dbb
|
【战斗】免疫效果自定义类型添加,免疫效果文字显示恢复
|
2020-11-13 19:34:41 +08:00 |
wangzhenxing
|
fee4501004
|
[战斗] 266被动修改
|
2020-11-13 18:42:27 +09:00 |
wangzhenxing
|
d6d5f5cdfa
|
257 561 267 技能修改
|
2020-11-13 17:38:35 +08:00 |
gaoxin
|
1568e2f288
|
【测试战斗】修复添加属性被动时报错
|
2020-11-13 17:27:15 +08:00 |
wangzhenxing
|
8a87f0a8a2
|
【战斗】91 被动修改
|
2020-11-13 18:23:56 +09:00 |
gaoxin
|
e1625e6bed
|
【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题
|
2020-11-03 17:17:46 +08:00 |
gaoxin
|
d10134216c
|
【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2
|
2020-11-02 22:13:34 +08:00 |
gaoxin
|
cb10b3ff1d
|
【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题。
|
2020-11-02 21:49:33 +08:00 |
gaoxin
|
9779a99414
|
【战斗】修复灵兽释放技能顺序错误
|
2020-11-02 21:24:00 +08:00 |
gaoxin
|
8b9276f6a2
|
【战斗】修复上一场残留数据会出现在下一场的问题
|
2020-11-02 21:23:55 +08:00 |
gaoxin
|
4cb8bee4ae
|
【战斗】修复凤凰技能第二回合无法触发的问题,修复战斗开始时界面显示回合数错误的问题
|
2020-11-02 19:17:14 +08:00 |
gaoxin
|
25f88a2a98
|
【LOG】删除无用log,添加凤凰技能概率log
|
2020-11-02 16:53:26 +08:00 |
gaoxin
|
ad4ebc14a0
|
【战斗】修复凤凰概率技能无法生效的问题
|
2020-11-02 16:31:57 +08:00 |
wangzhenxing
|
6c388f5d94
|
【效果】添加119效果
|
2020-11-02 16:21:06 +09:00 |
gaoxin
|
c90e209fd6
|
【战斗】修复技能效果修改导致被动技能报错的问题
|
2020-11-02 14:12:28 +08:00 |
gaoxin
|
02a57e692c
|
【战斗】修复部分被动技能报错
|
2020-11-02 13:49:53 +08:00 |
gaoxin
|
9b65cbba0f
|
【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题
|
2020-11-02 11:55:28 +08:00 |
gaoxin
|
230788670d
|
【战斗】主动效果117,118添加
|
2020-11-02 10:00:32 +08:00 |
gaoxin
|
9ed00e0ba5
|
【战斗】灵兽战斗逻辑同步
|
2020-11-01 16:17:26 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
gaoxin
|
ec7e498b87
|
【战斗】修复持续伤害会出现小数的问题
|
2020-10-27 15:16:04 +08:00 |
gaoxin
|
88516ad0e2
|
【战斗】加血普攻会触发降怒被动的问题,修改被动技能195全部免疫改为部分免疫
|
2020-10-26 19:43:04 +08:00 |
gaoxin
|
f4cfce396c
|
Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit 1f9165688f .
|
2020-10-20 21:02:13 +08:00 |
gaoxin
|
1f9165688f
|
【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题
|
2020-10-20 20:37:51 +08:00 |
gaoxin
|
cd03b49824
|
【战斗0.0.6】修复判断数据是否存在接口错误
|
2020-10-20 20:27:14 +08:00 |
wangzhenxing
|
b5b8f79dca
|
技能期间只触发一次被动触发条件修改
|
2020-10-20 16:29:44 +08:00 |
gaoxin
|
3625da459f
|
【战斗】修复桃子技能错误
|
2020-10-20 00:39:27 +08:00 |
gaoxin
|
321aa22ec6
|
【战斗 0.0.3】尝试修复偶现战斗卡死得问题
|
2020-10-19 18:37:51 +08:00 |
gaoxin
|
5dc4062a46
|
【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题
|
2020-10-17 20:08:40 +08:00 |
gaoxin
|
0baed21bf6
|
战斗逻辑同步
|
2020-10-17 18:35:52 +08:00 |
gaoxin
|
422a8abaa4
|
修复属性类被动会导致战斗日志报错的问题
|
2020-10-09 14:26:28 +08:00 |
JieLing
|
223f8b11b4
|
修复在手机上战斗报错
|
2020-09-27 20:54:50 +08:00 |
JieLing
|
907d092c04
|
遗漏同步提交
|
2020-09-27 18:27:20 +08:00 |
gaoxin
|
541b4fc271
|
战斗逻辑同步
|
2020-09-27 16:56:15 +08:00 |
gaoxin
|
b62fe63c84
|
关闭战斗log
|
2020-09-05 20:40:33 +08:00 |
gaoxin
|
92a8b93b50
|
修改屏幕的适配方式,修改计算屏幕位置的方法
|
2020-09-05 12:15:58 +08:00 |
zhangqiang
|
82b1d2595a
|
Merge branch 'master_develop' into master_tishen_hw
|
2020-09-04 13:47:12 +08:00 |
wangzhenxing
|
3232e4126f
|
effect: 116 兼容金翅大鹏10星天赋
|
2020-09-03 15:20:27 +09:00 |
wangzhenxing
|
9473b158e4
|
释放技能逻辑修改,如果角色在释放技能前死了就把队列里要释放的技能都不做处理,只有死亡后才触发的技能才会释放和有不灭的英雄的技能
|
2020-09-02 19:01:11 +09:00 |
gaoxin
|
3af306318d
|
删除无用log
|
2020-08-27 20:00:33 +08:00 |
gaoxin
|
e834044de0
|
修复战斗最后一回合结束还会再打一次的问题
|
2020-08-26 18:33:47 +08:00 |
wangzhenxing
|
c9638f15e9
|
检测不灭效果还原
|
2020-08-26 15:24:37 +09:00 |
wangzhenxing
|
0a255a5c1f
|
选择对位英雄逻辑修改
|
2020-08-26 14:11:00 +09:00 |
wangzhenxing
|
7d11f4b25f
|
还原之前死亡逻辑
|
2020-08-25 17:27:48 +09:00 |
wangzhenxing
|
6eaedb249d
|
解决 【ID1008832】
【技能】单独两个金翅大鹏,都触发了不灭,应该是先触发不灭的一方失败
|
2020-08-25 17:09:46 +09:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
wangzhenxing
|
f007e185f8
|
116效果添加注释
|
2020-08-24 18:55:07 +09:00 |
wangzhenxing
|
ff791bb871
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:18:34 +09:00 |
wangzhenxing
|
46df2e7418
|
添加116效果
|
2020-08-24 17:16:43 +09:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
wangzhenxing
|
9a7b7c8eff
|
被动108 改为自身死亡后就不会反弹伤害
|
2020-08-21 15:59:34 +09:00 |
wangzhenxing
|
0f71f295d2
|
被动最佳技能添加类型判断,如果可以触发其他被动就赋成绝技类型,否是附加类型
|
2020-08-21 15:49:42 +09:00 |
wangzhenxing
|
dc77526a67
|
把死亡人数检测放到最后检测,防止有些有复活技能无法触发
|
2020-08-20 18:07:08 +09:00 |
wangzhenxing
|
9aec289306
|
添加新被动242,243 技能概率追加技能,击杀追加技能
|
2020-08-20 16:54:03 +09:00 |
wangzhenxing
|
0e6c9ce414
|
阎罗王被动根据异常类型加伤修改
|
2020-08-18 20:07:00 +09:00 |
wangzhenxing
|
d16361e4d1
|
纵排改为仇恨目标
|
2020-08-18 10:26:24 +09:00 |
wangzhenxing
|
46ec8ef4b4
|
吸血修改,由finalDamage 改为 damage
|
2020-08-17 19:15:04 +09:00 |
wangzhenxing
|
e139a43f65
|
屏蔽金翅大鹏不死效果
|
2020-08-14 16:50:32 +09:00 |
jiaoyangna
|
96d47d34a8
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
# data_execl/base_data/GlobalSystemConfig.xlsx
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/RechargeCommodityConfig.xlsx
|
2020-08-12 14:17:01 +08:00 |
wangzhenxing
|
6d274b7991
|
【ID1008763】
【技能】124 释放技能后回复己方后排[a]点怒气 (目标不正确,给双方后排加怒)
|
2020-08-12 10:24:02 +09:00 |
wangzhenxing
|
7953575074
|
角色身上如果有无敌盾不会扣出怒气
|
2020-08-10 15:50:28 +09:00 |
gaoxin
|
a35b26a215
|
修改平分概率类型的技能的概率计算方式
|
2020-08-07 17:35:16 +08:00 |
gaoxin
|
723531298d
|
删除被动194额外附加伤害也会触发效果的并导致报错的问题,
|
2020-08-07 10:57:30 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
wangzhenxing
|
416cfbde79
|
技能释放后摇时间添加0.2
|
2020-08-06 18:01:59 +09:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
gaoxin
|
6bfebc928f
|
战斗日志打印文件名修改,战斗数据optiondata变为userdata
|
2020-08-01 11:16:33 +08:00 |
gaoxin
|
1379fe1f0e
|
部分log删除
|
2020-07-30 14:13:20 +08:00 |
wangzhenxing
|
a2635081af
|
规避不灭效果修改
|
2020-07-29 13:41:15 +09:00 |
gaoxin
|
72921a8f51
|
修复行动时遭受异常状态死亡时会继续释放技能的问题
|
2020-07-28 17:19:57 +08:00 |
wangzhenxing
|
19a069994b
|
修改杨戬锤不死金翅大鹏一直锤的bug
|
2020-07-27 15:19:17 +09:00 |
gaoxin
|
7d9a555151
|
修复被动225报错
|
2020-07-25 19:24:29 +08:00 |
wangzhenxing
|
60b7e750a6
|
【ID1007274】
【技能】无敌盾应清除目标所有负面状态
|
2020-07-23 16:19:00 +09:00 |
wangzhenxing
|
228d2da247
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 11:34:22 +09:00 |
wangzhenxing
|
e12c485c99
|
添加225效果及 添加减乘运算
|
2020-07-23 11:34:08 +09:00 |
gaoxin
|
d6561a8c07
|
先后手协议添加
|
2020-07-22 21:39:45 +08:00 |
gaoxin
|
aa16826682
|
战斗先后手功能添加
|
2020-07-22 21:24:42 +08:00 |
gaoxin
|
3152ff0f41
|
修复部分技能报错的问题
|
2020-07-16 20:43:11 +08:00 |
gaoxin
|
6303805bfa
|
修复未命中时报错的问题
|
2020-07-09 15:18:02 +08:00 |
2han9B1a0
|
7c7684a714
|
冲突提交
|
2020-07-08 21:19:34 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
7a410e1b60
|
内网测试 0.15.5
|
2020-06-19 16:18:05 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
00892194b5
|
提交
|
2020-05-11 09:38:52 +08:00 |
JieLing
|
3a6591404d
|
提交
|
2020-05-09 14:12:31 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |