Commit Graph

9563 Commits (a0911448b2a217b2ed53a4648e7ba68ba9a48dfc)
 

Author SHA1 Message Date
gaoxin ace42823db 【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题 2021-09-26 20:48:32 +08:00
gaoxin 2bce8547c7 【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害 2021-09-26 20:31:51 +08:00
jiaoyangna d39ef472dc 好感度提交 2021-09-26 20:23:08 +08:00
wangzhenxing 3ff3649284 【功能】======白金装备合成 最少显示信息修改 2021-09-26 20:03:14 +08:00
wangzhenxing 306ab999b9 [功能]=============白金装备合成红点修改 2021-09-26 19:47:18 +08:00
liujiaqi f8f07c0bea 织女法宝图标和音频 2021-09-26 19:13:15 +08:00
gaoxin f282fe046b 【白金装备】修改白金装备字体显示 2021-09-26 18:41:47 +08:00
gaoxin 54afaef65a 【GM】一键顶级装备红色一星装备生成错误 2021-09-26 17:43:38 +08:00
gaoxin e318ca197f 【GM】一键顶级装备,增加白金装备 2021-09-26 17:40:48 +08:00
ZhangBiao a565d94658 【御剑行】资源提交 2021-09-26 17:39:49 +08:00
gaoxin 8310c29aaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:38:39 +08:00
gaoxin b21e7efe0d 【角色信息】修复跳转到角色信息界面,点击左右箭头报错 2021-09-26 17:38:23 +08:00
wangzhenxing e763b6472b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:31:16 +08:00
wangzhenxing a3e1782007 【功能】==========白金装备合成提交 2021-09-26 17:30:35 +08:00
gaoxin e61dea0f4a 【白金装备】套装显示添加 2021-09-26 17:13:12 +08:00
jiaoyangna d7276eae64 战力修改提交 2021-09-26 15:23:33 +08:00
gaoxin e671673389 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 15:02:49 +08:00
gaoxin 59311a8d88 【跨服】算错了跨服前七天的事件 2021-09-26 15:02:33 +08:00
wangzhenxing e1c0ee1613 [战斗]====御甲条图片修改 2021-09-26 14:58:02 +08:00
wangzhenxing 221939e1ec [战斗]==========御甲条显示修改 2021-09-26 14:56:07 +08:00
jiaoyangna 330b36b55a 好感度等级修改 2021-09-26 14:21:22 +08:00
jiaoyangna e59f160387 好感度等级修改提交 2021-09-26 13:55:57 +08:00
gaoxin 6a71a972e9 【战斗力】关闭一些log 2021-09-26 11:18:38 +08:00
jiaoyangna 14b967185b 好感度提交 2021-09-26 10:18:51 +08:00
gaoxin cc68282fb8 【法宝升阶】修复战力提升文字显示错误 2021-09-26 10:16:00 +08:00
ZhangBiao f1dd5d195c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 10:08:38 +08:00
ZhangBiao 59e51aefef 【七界试炼】提交 2021-09-26 10:08:15 +08:00
gaoxin 9b67b9247b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 10:04:06 +08:00
gaoxin b318ed5678 【资源】部分界面战力文字换成评分 2021-09-26 10:03:50 +08:00
ZhangBiao 8f9743d127 【七界试炼】激活遗物提示,奖励遮盖 2021-09-26 10:01:37 +08:00
jiaoyangna 1152586ff1 好感度提交 2021-09-26 09:54:58 +08:00
ZhangBiao bac86d5ec8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 19:23:43 +08:00
liujiaqi cc33532a51 【资源】女儿国王皮肤音效 2021-10-01 18:06:48 +08:00
ZhangBiao 1a866b1068 【七界试炼】提交 2021-09-24 19:23:30 +08:00
gaoxin 8c76d476a2 【编队】修复保存编队接口名修改导致的报错 2021-09-24 17:49:32 +08:00
wangzhenxing d83cf97ae2 【战斗】==========被动93 307 309 351修改 2021-09-24 17:40:08 +08:00
ZhangBiao 1505647241 【七界试炼】框位不齐 2021-09-24 17:02:38 +08:00
ZhangBiao 35091621dc 【七界试炼】提交 2021-09-24 16:52:05 +08:00
ZhangBiao a823984187 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 16:47:19 +08:00
ZhangBiao 028f97c195 【七界试炼】红点和跳转i需改 2021-09-24 16:47:06 +08:00
yuanshuai 77a47432bf 【四象心法】强化按钮点击强化两次bug修改 2021-09-24 15:59:01 +08:00
yuanshuai ad8f5ac73e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:45:50 +08:00
yuanshuai 7f94f9e185 思想心法bug修改 2021-09-24 15:45:20 +08:00
wangzhenxing 34f52e18e7 [战斗]=====被动352 描述修改 2021-09-24 15:20:59 +08:00
wangzhenxing e8b7af1cf7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:14:29 +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
ZhangBiao ff9d22e14d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:12:42 +08:00
ZhangBiao ce1a5f25ea 【七界试炼】奖励位置调整 2021-09-24 15:11:57 +08:00
wangzhenxing 8de85a24a4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:04:57 +08:00
gaoxin c15294b14c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:00:57 +08:00