zhangqiang
|
c6b0acb7d8
|
Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
|
2020-08-18 19:36:17 +08:00 |
zhangqiang
|
00f1060be7
|
公会副本提交初始界面
|
2020-08-18 19:33:31 +08:00 |
ZhangBiao
|
f18973cea9
|
极速达人修改
|
2020-08-18 19:17:20 +08:00 |
jiaoyangna
|
a5209137f0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 10:34:27 +08:00 |
jiaoyangna
|
3e9fcb7e71
|
xuanyuan update
|
2020-08-18 10:33:19 +08:00 |
jiaoyangna
|
92447e21a8
|
列表优化提交
|
2020-08-18 10:22:24 +08:00 |
wangzhenxing
|
98eb034cfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 10:26:44 +09:00 |
wangzhenxing
|
d16361e4d1
|
纵排改为仇恨目标
|
2020-08-18 10:26:24 +09:00 |
wangzhenxing
|
46ec8ef4b4
|
吸血修改,由finalDamage 改为 damage
|
2020-08-17 19:15:04 +09:00 |
wangzhenxing
|
cd5f26e8af
|
完整显示多段伤害
|
2020-08-17 17:12:34 +09:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
jiaoyangna
|
7ff435c765
|
xuanyuan update
|
2020-08-17 15:48:40 +08:00 |
jiaoyangna
|
17524007d7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 15:18:03 +08:00 |
jiaoyangna
|
0210dc3109
|
conflict commit
|
2020-08-17 15:17:58 +08:00 |
ZhangBiao
|
77b3386efb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 11:57:01 +08:00 |
ZhangBiao
|
c2fdcb06bd
|
极速达人
|
2020-08-17 11:56:38 +08:00 |
zhangqiang
|
6df142b067
|
修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏
|
2020-08-17 11:39:41 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +08:00 |
jiaoyangna
|
d97203bf0b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 21:05:30 +08:00 |
jiaoyangna
|
740eb7253d
|
xuanyuan commit
|
2020-08-14 20:41:07 +08:00 |
JieLing
|
66687a1ce4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 17:49:33 +08:00 |
jiaoyangna
|
481c818ffa
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 17:43:30 +08:00 |
jiaoyangna
|
84f82d488d
|
live2d commit
|
2020-08-14 17:43:24 +08:00 |
JieLing
|
7453825d63
|
Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
# Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
# Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
# Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
|
2020-08-14 17:41:21 +08:00 |
jiaoyangna
|
0b157b6ee8
|
轩辕宝镜入口替换
|
2020-08-14 16:09:00 +08:00 |
wangzhenxing
|
e139a43f65
|
屏蔽金翅大鹏不死效果
|
2020-08-14 16:50:32 +09:00 |
jiaoyangna
|
4604df2d0b
|
修改轩辕副本立绘
|
2020-08-14 14:36:24 +08:00 |
jiaoyangna
|
40b9550c54
|
修改轩辕副本立绘提交
|
2020-08-14 14:35:48 +08:00 |
jiaoyangna
|
1f7b161087
|
五星成长礼修改提交
|
2020-08-14 13:32:55 +08:00 |
jiaoyangna
|
905d77b0c6
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 13:01:17 +08:00 |
jiaoyangna
|
c9c3cb2fa4
|
operatingmanager commit
|
2020-08-14 13:01:12 +08:00 |
ZhangBiao
|
7a1e1599d8
|
|
2020-08-14 10:14:53 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
ZhangBiao
|
e655562a71
|
|
2020-08-13 17:07:05 +08:00 |
ZhangBiao
|
9bac8e2bfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 16:38:57 +08:00 |
ZhangBiao
|
e397fa88e7
|
|
2020-08-13 16:38:40 +08:00 |
wangzhenxing
|
442877d3e0
|
珍奇宝阁预设代码提交
|
2020-08-13 16:38:20 +09:00 |
jiaoyangna
|
fbf7c3b41d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:44:53 +08:00 |
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
ZhangBiao
|
2fe27c64ec
|
|
2020-08-13 12:33:21 +08:00 |
ZhangBiao
|
a6d69bd001
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 12:00:38 +08:00 |
ZhangBiao
|
f4dad25b7a
|
神将置换bug修复
|
2020-08-13 12:00:18 +08:00 |
gaoxin
|
de27163861
|
合成修改
|
2020-08-13 11:46:55 +08:00 |
gaoxin
|
b4eef8c285
|
神将合成显示修改
|
2020-08-13 11:11:26 +08:00 |
gaoxin
|
48d8f3887b
|
修改神将合成显示问题
|
2020-08-13 10:28:16 +08:00 |
jiaoyangna
|
937d46ff75
|
xuanyuan commit
|
2020-08-12 21:10:47 +08:00 |
jiaoyangna
|
a9ebd162ec
|
轩辕 提交
|
2020-08-12 21:10:36 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |