jiaoyangna
|
66556e506a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 11:33:24 +08:00 |
jiaoyangna
|
22de98dc18
|
commit
|
2020-08-28 11:31:38 +08:00 |
jiaoyangna
|
e4a9c5c614
|
qinglong update
|
2020-08-28 11:05:31 +08:00 |
ZhangBiao
|
7ae97fdff0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 11:24:02 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
jiaoyangna
|
948f47398c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 17:36:31 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
ZhangBiao
|
b650ba81e8
|
界面顺序调整
(cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5)
|
2020-08-20 16:48:30 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
jiaoyangna
|
d1a4bff97e
|
chengjiu update
|
2020-08-19 20:10:48 +08:00 |
jiaoyangna
|
785590bd4f
|
五星成长礼提交
|
2020-08-19 22:11:48 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
7e4b73dc27
|
两个副本,基本成型了
|
2020-08-18 21:03:55 +08:00 |
jiaoyangna
|
e2b2517ad0
|
live2d commit
|
2020-08-18 15:42:21 +08:00 |
jiaoyangna
|
95593175ec
|
dailycarbonpanel update
|
2020-08-18 14:00:03 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +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 |
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
|
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 |
JieLing
|
ad3ee94a75
|
资源压缩方式修改,苹果资源压缩方式添加,
|
2020-08-14 17:29:06 +08:00 |
jiaoyangna
|
40b9550c54
|
修改轩辕副本立绘提交
|
2020-08-14 14:35:48 +08:00 |
jiaoyangna
|
d27b4b165f
|
资源名重复修改提交
|
2020-08-14 14:29:06 +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
|
4c8d556b31
|
动态立绘提交
|
2020-08-14 12:59:19 +08:00 |
jiaoyangna
|
b4acffd954
|
动态立绘提交
|
2020-08-14 12:20:29 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
wangzhenxing
|
9dce11a6eb
|
测试战斗修改提交
|
2020-08-13 17:36:20 +09: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
|
d1ec3fa196
|
每周 每月礼包阴影问题修复
|
2020-08-13 13:33:48 +08:00 |
ZhangBiao
|
2fe27c64ec
|
|
2020-08-13 12:33:21 +08:00 |
jiaoyangna
|
937d46ff75
|
xuanyuan commit
|
2020-08-12 21:10:47 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +08:00 |
gaoxin
|
809e10df79
|
Merge branch 'master_develop2' into master_develop
|
2020-08-12 14:45:01 +08:00 |
jiaoyangna
|
8c27eecbf6
|
xuanyuan update
|
2020-08-12 14:30:55 +08:00 |
gaoxin
|
4e639d2401
|
Merge branch 'master_develop2' into master_develop
|
2020-08-12 14:22:29 +08:00 |
jiaoyangna
|
95dff6f0e9
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-08-12 14:20:45 +08:00 |