wangzhenxing
|
267598d53b
|
Revert "【战斗】=======被动199"
This reverts commit c8603f010f .
|
2021-10-16 18:07:30 +08:00 |
wangzhenxing
|
c8603f010f
|
【战斗】=======被动199
|
2021-10-16 16:47:57 +08:00 |
wangzhenxing
|
fbb1c387c7
|
【战斗】=======伤害公式 修改 去点 防御0.5的容错
|
2021-10-14 17:12:01 +08:00 |
wangzhenxing
|
f0fcd144f2
|
[战斗]===========被动添加 354 355
|
2021-10-14 13:54:07 +08:00 |
wangzhenxing
|
d2c2b39b8b
|
[战斗]==========被动312修改
|
2021-10-11 17:46:01 +08:00 |
wangzhenxing
|
453216c6c7
|
【战斗】==========被动344修改
|
2021-10-09 18:23:45 +08:00 |
wangzhenxing
|
79addd132d
|
[战斗]=========被动250 修改
|
2021-10-09 18:10:11 +08:00 |
wangzhenxing
|
4bd1047ccc
|
[战斗]=====被动116 258 281 312 344修改
|
2021-10-09 17:13:24 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
wangzhenxing
|
1a808dfd54
|
[战斗]============被动137修改 添加查找没有触发不灭的技能目标
|
2021-09-27 17:33:51 +08:00 |
wangzhenxing
|
70ebab2fe1
|
【功能】====装备合成添加特效
|
2021-09-27 16:25:20 +08:00 |
wangzhenxing
|
433ae25590
|
[战斗]======被动351 353 修改
|
2021-09-27 13:47:27 +08:00 |
gaoxin
|
ace42823db
|
【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题
|
2021-09-26 20:48:32 +08:00 |
gaoxin
|
2bce8547c7
|
【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害
|
2021-09-26 20:31:51 +08:00 |
wangzhenxing
|
221939e1ec
|
[战斗]==========御甲条显示修改
|
2021-09-26 14:56:07 +08:00 |
wangzhenxing
|
d83cf97ae2
|
【战斗】==========被动93 307 309 351修改
|
2021-09-24 17:40:08 +08:00 |
wangzhenxing
|
34f52e18e7
|
[战斗]=====被动352 描述修改
|
2021-09-24 15:20:59 +08:00 |
wangzhenxing
|
8ffd86ee19
|
Merge branch 'china/dev-c-battle' into china/dev
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 15:13:46 +08:00 |
wangzhenxing
|
19f7984f01
|
[战斗]=============新增352被动
|
2021-09-24 14:59:54 +08:00 |
wangzhenxing
|
9abf1ef390
|
Merge branch 'china/dev-c-battle' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 14:56:13 +08:00 |
wangzhenxing
|
48cc9357c1
|
[战斗]==========被动194修改 新增被动251 额外行动修改
|
2021-09-24 14:46:02 +08:00 |
wangzhenxing
|
cbb22260f3
|
Merge branch 'china/dev-c-battle' into china/dev
|
2021-09-23 11:02:19 +08:00 |
wangzhenxing
|
fbaca4e989
|
[战斗]====添加间接治疗得方法
|
2021-09-23 10:51:21 +08:00 |
wangzhenxing
|
d5ce7b7f84
|
【战斗】=======被动37修改
|
2021-09-17 17:07:57 +08:00 |
wangzhenxing
|
01e446fed3
|
[战斗]======免疫buff添加类型 5 免疫控制不免疫禁疗
|
2021-09-17 16:55:49 +08:00 |
wangzhenxing
|
df1409717d
|
【战斗】==============技能是否可以释放处 添加目标数量判断,如果没有目标则不能释放
|
2021-09-17 15:20:44 +08:00 |
wangzhenxing
|
52221aca04
|
【战斗】==========被动196 修改
|
2021-09-17 14:26:30 +08:00 |
wangzhenxing
|
4511eec383
|
【战斗】==========被动196 修改
|
2021-09-17 11:55:18 +08:00 |
wangzhenxing
|
e584db1eaa
|
[战斗]===========被动196 200 188修改
|
2021-09-16 20:31:12 +08:00 |
wangzhenxing
|
3b42d8034d
|
[战斗]==============技能实例里 技能是否能释放添加判断 如果没有攻击目标就返回 false
|
2021-09-16 17:27:16 +08:00 |
wangzhenxing
|
4ee0741896
|
[战斗]==============被动338修改 护甲逻辑修改
|
2021-09-15 11:23:04 +08:00 |
wangzhenxing
|
08ecd82227
|
【战斗】==============被动346 347 348 349 350 提交
|
2021-09-14 19:58:01 +08:00 |
wangzhenxing
|
dbf05190bc
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua
|
2021-09-14 10:32:25 +08:00 |
wangzhenxing
|
982e0c5268
|
【战斗】=======被动56修改
|
2021-09-13 20:17:37 +08:00 |
wangzhenxing
|
b468cb6164
|
[战斗]============被动56修改 boss免疫额外生命百分比伤害
|
2021-09-13 19:43:13 +08:00 |
wangzhenxing
|
79778b6eec
|
【战斗】===========被动261 修改
|
2021-09-11 16:04:06 +08:00 |
gaoxin
|
2a23609ed6
|
【战斗】添加缺失的方法
|
2021-09-07 19:43:08 +08:00 |
gaoxin
|
0bd0137a2b
|
【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
2、添加用于debug的log
|
2021-09-07 15:14:10 +08:00 |
wangzhenxing
|
3e36a537b3
|
[战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改
|
2021-09-01 18:40:32 +08:00 |
gaoxin
|
8a0b1c80a2
|
【战斗】被动添加时Log
|
2021-08-31 14:48:44 +08:00 |
gaoxin
|
4e8e552ca8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-31 14:29:46 +08:00 |
wangzhenxing
|
7eeebb014e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-31 14:26:02 +08:00 |
wangzhenxing
|
8c6c57d916
|
[战斗]=============被动263 269 274 332 112 145 修改提交
|
2021-08-31 14:25:43 +08:00 |
gaoxin
|
93413b3b07
|
【战斗】添加一些战斗日志
|
2021-08-31 14:25:29 +08:00 |
gaoxin
|
c67c9fb93b
|
【战斗】修复战斗报错
|
2021-08-31 13:44:13 +08:00 |
wangzhenxing
|
6ef1d6c643
|
【战斗】===========被动115 DOT类Buff 清除逻辑修改
|
2021-08-27 18:02:50 +08:00 |
wangzhenxing
|
58f34e049b
|
【战斗】=============被动91,160 修改提交
|
2021-08-27 15:27:53 +08:00 |
wangzhenxing
|
9a02e18582
|
【战斗】==============被动 141 310 283 330 336 修改提交
|
2021-08-20 16:05:33 +08:00 |
wangzhenxing
|
11a39abcd4
|
[战斗]==========伤害修改提交
|
2021-08-12 15:42:31 +08:00 |
wangzhenxing
|
08d02a0b6d
|
[战斗]==========后续紫府神印提交
|
2021-08-12 15:11:38 +08:00 |
wangzhenxing
|
c3ca8f5286
|
Merge branch 'china/dev' into china/dev-c-battle
|
2021-08-03 11:49:12 +08:00 |
gaoxin
|
ac62390992
|
Revert "Revert "[战斗]========服务器发送随机种子修改""
This reverts commit 0b827be035 .
|
2021-08-02 19:22:05 +08:00 |
gaoxin
|
0b827be035
|
Revert "[战斗]========服务器发送随机种子修改"
This reverts commit 331621bfd0 .
|
2021-08-02 18:26:33 +08:00 |
wangzhenxing
|
331621bfd0
|
[战斗]========服务器发送随机种子修改
|
2021-08-02 16:46:54 +08:00 |
wangzhenxing
|
fdfa2dd76b
|
[战斗]============追加额外技能是否触发特性修改,哪吒大招后摇时间延长
|
2021-07-30 16:03:22 +08:00 |
wangzhenxing
|
2cafeecb80
|
[战斗]==============死亡技能不受眩晕,沉默影响
|
2021-07-29 15:44:23 +08:00 |
wangzhenxing
|
59f131e824
|
[战斗]============被动338,339提交
|
2021-07-21 16:33:23 +08:00 |
wangzhenxing
|
59b36cbf94
|
[战斗]==========被动292 修改 追加得技能一次行动只追加一次,且不触发任何特性
|
2021-07-16 18:36:52 +08:00 |
wangzhenxing
|
4d428fd383
|
[战斗]==========被动292 ,319 修改
|
2021-07-15 18:20:38 +08:00 |
wangzhenxing
|
33b37451e1
|
【战斗】=============被动 108 200 283 322 修改 新增被动 337
|
2021-07-09 11:54:02 +08:00 |
wangzhenxing
|
f247221fcc
|
【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能)
|
2021-07-07 20:29:37 +08:00 |
wangzhenxing
|
94dde31cf9
|
[战斗]====中毒伤害图片字提交
|
2021-07-02 19:12:09 +08:00 |
wangzhenxing
|
338ab55daa
|
【战斗】=========新增336被动
|
2021-07-02 14:49:28 +08:00 |
wangzhenxing
|
6e0c8e55c8
|
[战斗]==========被动335修改 困难副本 星级条件13修改
|
2021-07-02 11:20:52 +08:00 |
wangzhenxing
|
d00d69ff68
|
[战斗]============第二期紫府神印提交
|
2021-07-02 09:56:06 +08:00 |
wangzhenxing
|
1be7c40f2f
|
[战斗]==========困难副本 13类型 检测修改
|
2021-07-01 11:51:30 +08:00 |
wangzhenxing
|
f50ffa0746
|
Merge branch 'china/dev' into china/dev-c-battle
|
2021-06-30 19:53:11 +08:00 |
wangzhenxing
|
b99c52d22c
|
【bug】========【ID1016790】
灼烧 中毒等buff 在携带者被杀死的情况不提示清除
|
2021-06-30 18:03:13 +08:00 |
wangzhenxing
|
5e8bab74af
|
[战斗]==========被动26, 327 107, 331 修改提交
|
2021-06-23 16:28:57 +08:00 |
wangzhenxing
|
d943d3044b
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-06-21 15:29:16 +08:00 |
wangzhenxing
|
5184ced8c8
|
[战斗]==============免疫buff清除提示修改
|
2021-06-19 16:41:00 +08:00 |
gaoxin
|
ac7501a1d5
|
【战斗】修复群体性的免疫效果不会正常消失的问题
|
2021-06-17 16:01:48 +08:00 |
wangzhenxing
|
27b3d6e5c7
|
【战斗】=============被动56,被动283,被动324修改 不灭修改
|
2021-06-17 14:12:34 +08:00 |
wangzhenxing
|
b1425236af
|
[战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交
|
2021-06-16 10:27:56 +08:00 |
wangzhenxing
|
588ca169c9
|
[战斗]======被动200去掉注释
|
2021-06-11 11:51:52 +08:00 |
gaoxin
|
4ee928c2d4
|
Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c
|
2021-06-10 22:56:18 +08:00 |
jiaoyangna
|
b76f517cbb
|
[战斗]===============被动200修改 同阵营这个被动只会触发一次
|
2021-06-10 22:08:51 +08:00 |
wangzhenxing
|
4165e6acd5
|
【战斗】=======注释之前被动200修改
|
2021-06-10 22:02:35 +08:00 |
wangzhenxing
|
77121e01e3
|
[战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个
|
2021-06-10 21:57:00 +08:00 |
wangzhenxing
|
ba04ea8e71
|
【心愿抽卡】====修改概率显示,必得剩余次数修改
|
2021-06-02 11:29:26 +08:00 |
wangzhenxing
|
7387023dfe
|
[战斗]======通关星级条件 检测逻辑 4 修改
|
2021-05-31 17:33:29 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
gaoxin
|
33efb7bc2a
|
【修行】亢龙有悔,东陵圣母大招没有眩晕敌方,没回怒
【修行】亢龙有悔神印,达摩连续追击,连续没眩晕,只第一次回了怒
|
2021-05-27 23:33:03 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
gaoxin
|
c8a8683be0
|
【山河社稷图】条件:5回合内打出8万伤害,如果我在第三回合打出7万伤害,第四回合直接秒杀怪物,面板总计造成12万伤害但是不给星星
|
2021-05-27 16:38:31 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
zhangqiang
|
e763e54799
|
Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-05-17 11:04:01 +08:00 |
wangzhenxing
|
bcc175ea8f
|
【战斗】==========被动107 被动321 修改
|
2021-05-14 17:48:57 +08:00 |
wangzhenxing
|
b192d75b07
|
【战斗】=====被动去log
|
2021-05-13 11:34:25 +08:00 |
wangzhenxing
|
501140fa52
|
[战斗]=========被动增加 316-321
|
2021-05-13 11:24:35 +08:00 |
wangzhenxing
|
32d592b7bc
|
[战斗]====精英副本相关修改提交
|
2021-05-11 17:05:11 +08:00 |
gaoxin
|
b7b3f610ed
|
【翻译文字导出】
|
2021-05-11 17:03:09 +08:00 |
wangzhenxing
|
7a5d44a8f2
|
【战斗】============被动313修改
|
2021-04-26 10:00:11 +08:00 |
wangzhenxing
|
324c93e93f
|
【战斗】==============被动313修改
|
2021-04-25 19:50:54 +08:00 |
wangzhenxing
|
efa66c0130
|
【战斗】=========被动313 修改
|
2021-04-25 15:53:24 +08:00 |
wangzhenxing
|
26d50be57c
|
【战斗】================增加313被动
|
2021-04-25 15:46:08 +08:00 |
gaoxin
|
3819869e27
|
Merge branch 'china/dev' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
|
2021-04-21 17:54:16 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
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 |