Commit Graph

6468 Commits (81a3db04465518501b25428a7061e3a380fa1e94)

Author SHA1 Message Date
ZhangBiao 81a3db0446 【御剑行】提交 2021-10-08 15:45:28 +08:00
ZhangBiao 660a88b965 【御剑行】提交 2021-09-29 18:34:54 +08:00
ZhangBiao fa1c5a5dee 【御剑行】提交 2021-09-28 17:48:28 +08:00
ZhangBiao 422806200e 【御剑行】提交 2021-09-28 10:34:05 +08:00
ZhangBiao 98d3911f23 【四象心法】增加跳转 2021-09-27 14:32:59 +08:00
ZhangBiao a565d94658 【御剑行】资源提交 2021-09-26 17:39:49 +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 221939e1ec [战斗]==========御甲条显示修改 2021-09-26 14:56:07 +08:00
gaoxin 6a71a972e9 【战斗力】关闭一些log 2021-09-26 11:18:38 +08:00
ZhangBiao 59e51aefef 【七界试炼】提交 2021-09-26 10:08:15 +08:00
ZhangBiao 8f9743d127 【七界试炼】激活遗物提示,奖励遮盖 2021-09-26 10:01:37 +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
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 19f7984f01 [战斗]=============新增352被动 2021-09-24 14:59:54 +08:00
ZhangBiao c862eac46e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 14:57:14 +08:00
ZhangBiao b0e24676b3 【七界试炼】增加秘宝入口开启处理 2021-09-24 14:57:04 +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
jiaoyangna 136d872fbd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 14:20:32 +08:00
jiaoyangna 003583db7b 无尽副本报错修改 2021-09-24 14:19:50 +08:00
ZhangBiao 9ff1957ff7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 14:06:26 +08:00
ZhangBiao c9305b4247 【七界试炼】提交 2021-09-24 14:06:09 +08:00
gaoxin ddb97196d9 【首充】金额改为special表配置 2021-09-24 11:05:39 +08:00
ZhangBiao 35e6c617fb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 10:28:10 +08:00
ZhangBiao 8bd1896aba 【七界试炼】敌方英雄展示修改 2021-09-24 10:27:56 +08:00
gaoxin 2473fb149a 【ID1018513】【魂印分解】选择多个魂印分解时就算紫色也会提示选择了金色,单个魂印分解时就算白金也不提示
【ID1018512】【魂印分解】列表拖动到底部,点击筛选页签,不回弹
2021-09-24 10:17:25 +08:00
gaoxin 65efa9336c 【魂印】修复神将恭送后没有重置魂印的穿戴状态,导致力战之躯魂印无法穿戴的问题 2021-09-23 20:59:44 +08:00
ZhangBiao a2d7bedb5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 19:47:32 +08:00
ZhangBiao d0c38ec9d7 【七界试炼】提交 2021-09-23 19:47:17 +08:00
gaoxin 65df3f1a37 【名字】添加名称正确性检测 2021-09-23 19:43:24 +08:00
gaoxin c3820f13ae 【编队】修复无法复制编队的问题 2021-09-23 19:42:45 +08:00
ZhangBiao 6ced770ef1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 19:23:37 +08:00
ZhangBiao 5af10faa57 【七界试炼】提交 2021-09-23 19:23:27 +08:00
gaoxin 0d76922c85 【编队】刷新编队时,保存编队的方法错误 2021-09-23 17:54:29 +08:00
jiaoyangna ee5182dced 玲珑宝镜领取状态修改提交 2021-09-23 16:59:30 +08:00