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 |
gaoxin
|
6a71a972e9
|
【战斗力】关闭一些log
|
2021-09-26 11:18:38 +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 |
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 |
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 |