Commit Graph

9563 Commits (a0911448b2a217b2ed53a4648e7ba68ba9a48dfc)
 

Author SHA1 Message Date
gaoxin 5f3768e831 【新资源meta文件上传】 2021-09-24 15:00:44 +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 c573d83eeb 女儿国王特效资源提交 2021-09-24 14:53:47 +08:00
liujiaqi f89e16792e 【资源】女儿国王大小头像 2021-09-24 14:53:34 +08:00
gaoxin 4e441f4942 【资源】女儿国王默认动画添加 2021-09-24 14:53:04 +08:00
gaoxin 00db8bf660 【资源】女儿国王皮肤资源上传 2021-09-24 14:52:58 +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
liujiaqi 0b91f698c8 【资源】麒麟卡 2021-09-24 12:41:05 +08:00
liujiaqi 8531ab1c2e 【资源】坐骑icon 2021-09-24 12:40:57 +08:00
gaoxin 8fd74e7e99 【资源】坐骑麒麟live2d上传 2021-09-24 12:40:35 +08:00
gaoxin 5c3fb8408b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 11:07:21 +08:00
gaoxin ddb97196d9 【首充】金额改为special表配置 2021-09-24 11:05:39 +08:00
luyao 9e2f4e1512 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 11:02:53 +08:00
luyao a807bb6cf5 bat Resource Commit:2021/09/24,11:02:09 2021-09-24 11:02:09 +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 a255a6fb42 点击区域修改提交 2021-09-23 17:25:33 +08:00
jiaoyangna ee5182dced 玲珑宝镜领取状态修改提交 2021-09-23 16:59:30 +08:00
jiaoyangna fcae70ae04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:50:48 +08:00
jiaoyangna 80e2cab589 玲珑宝镜跳转修改提交 2021-09-23 16:50:24 +08:00
ZhangBiao 170d4886e3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:46:50 +08:00
ZhangBiao 93b3839727 【七界试炼】商店刷新事件 2021-09-23 16:46:35 +08:00
jiaoyangna ec8d3631d9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:46:16 +08:00
skuld 85f227ee8e bat Resource Commit:2021/10/12, 2:02:56 2021-10-12 02:02:56 +08:00
jiaoyangna 5b7b607725 主城玲珑宝镜入口提交 2021-09-23 16:21:51 +08:00
gaoxin 515294f16b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:17:09 +08:00
gaoxin 0f534367c5 【战斗力】不再计算编队老战斗力 2021-09-23 16:16:57 +08:00
luyao 1a2e24b96d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:13:14 +08:00
luyao ca6b5ebe7d bat Resource Commit:2021/09/23,16:11:26 2021-09-23 16:11:26 +08:00
ZhangBiao 9b24649f36 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:08:13 +08:00
ZhangBiao 0422b5c738 【七界试炼】提交 2021-09-23 16:08:02 +08:00
gaoxin ac88b50cae 【编队】修复打开四灵试炼编队报错 2021-09-23 16:05:18 +08:00
gaoxin 41aaab4d09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 15:52:30 +08:00
gaoxin f6c336e52f 【战斗力】添加一些log 2021-09-23 15:52:19 +08:00