ZhangBiao
|
28d4b2a8be
|
【玩家信息】提交
|
2022-01-15 13:07:28 +08:00 |
ZhangBiao
|
7feefd2078
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 13:01:44 +08:00 |
ZhangBiao
|
fa1c832170
|
【坐骑】增加详细信息
|
2022-01-15 13:00:45 +08:00 |
ZhangBiao
|
ed48c7ce00
|
【寻仙招募】修改,提交
|
2022-01-15 10:27:48 +08:00 |
ZhangBiao
|
232491eb95
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 09:14:10 +08:00 |
jiaoyangna
|
9f5addf443
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 19:14:04 +08:00 |
jiaoyangna
|
98f23e56ea
|
神将修改提交
|
2022-01-14 19:13:46 +08:00 |
wangzhenxing
|
c2c9eda981
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:50:17 +08:00 |
wangzhenxing
|
05377b9595
|
[图鉴]==== 图鉴 图鉴详情界面修改
|
2022-01-14 18:49:49 +08:00 |
jiaoyangna
|
75be0809dd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:49:21 +08:00 |
jiaoyangna
|
b0611db595
|
神将技能修改提交
|
2022-01-14 18:48:23 +08:00 |
ZhangBiao
|
e1a52271be
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:47:55 +08:00 |
ZhangBiao
|
5d2fdc5773
|
【仙缘汇聚箱】报错修改
|
2022-01-14 18:47:41 +08:00 |
jiaoyangna
|
2df72a0edd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:40:17 +08:00 |
jiaoyangna
|
3369bcc73c
|
心愿修改提交
|
2022-01-14 18:40:00 +08:00 |
ZhangBiao
|
3e47cae110
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:28:47 +08:00 |
ZhangBiao
|
d7bd3a07d8
|
【心愿抽奖】报错修改
|
2022-01-14 18:28:36 +08:00 |
jiaoyangna
|
ea69ec6643
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:59:05 +08:00 |
jiaoyangna
|
81ce84e7be
|
升级修改提交
|
2022-01-14 17:57:12 +08:00 |
ZhangBiao
|
0b7943c391
|
【家园】特权按钮修改
|
2022-01-14 17:44:54 +08:00 |
ZhangBiao
|
cbea9006b3
|
【家园】资源替换
|
2022-01-14 17:38:46 +08:00 |
jiaoyangna
|
b249db487a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:14:11 +08:00 |
jiaoyangna
|
c11db3056f
|
神将修改
|
2022-01-14 17:13:36 +08:00 |
gaoxin
|
7c5284b1e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:11:08 +08:00 |
gaoxin
|
df2e07b0e3
|
【心魔编队】保存后自动关闭界面
|
2022-01-14 17:11:02 +08:00 |
jiaoyangna
|
0189f5c742
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 16:15:17 +08:00 |
jiaoyangna
|
3f267894a8
|
神将修改提交
|
2022-01-14 16:14:52 +08:00 |
ZhangBiao
|
8f554eca59
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 16:02:59 +08:00 |
gaoxin
|
1c827a3a23
|
【关卡】有可挑战关卡时添加小手显示
|
2022-01-14 16:02:10 +08:00 |
jiaoyangna
|
d6521af965
|
许愿神将边框修改
|
2022-01-14 15:52:16 +08:00 |
ZhangBiao
|
28d3f421bc
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交
|
2022-01-14 15:44:45 +08:00 |
jiaoyangna
|
2142bc452b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:53:14 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
ZhangBiao
|
771c445488
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 14:16:47 +08:00 |
ZhangBiao
|
f9990072d5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:15:16 +08:00 |
ZhangBiao
|
930b93286d
|
【家园】数据不更新修改
|
2022-01-14 14:14:48 +08:00 |
gaoxin
|
69e6011950
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 13:52:55 +08:00 |
gaoxin
|
09f65e9f38
|
【修行】优化修行突破后显示
|
2022-01-14 13:51:13 +08:00 |
wangzhenxing
|
cff6c3f21b
|
[战斗]=====被动418-421提交
|
2022-01-14 13:49:39 +08:00 |
jiaoyangna
|
981aba2417
|
神将情报修改提交
|
2022-01-14 11:26:13 +08:00 |
jiaoyangna
|
8377e33b31
|
神将情报修改提交
|
2022-01-14 10:50:51 +08:00 |
jiaoyangna
|
17db5f29c4
|
框修改提交
|
2022-01-14 10:25:27 +08:00 |
jiaoyangna
|
ed63358ab6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
|
2022-01-14 10:19:54 +08:00 |
jiaoyangna
|
e4ea506ed1
|
神将情报修改提交
|
2022-01-14 10:17:19 +08:00 |
ZhangBiao
|
8af671a6f8
|
【装备加持】排行榜查看玩家时装备加持不显示突破数值和突破属性
|
2022-01-14 10:14:29 +08:00 |
ZhangBiao
|
5b36346da3
|
【玩家信息】提交
|
2022-01-13 18:29:12 +08:00 |
ZhangBiao
|
27cb303fc3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 18:27:01 +08:00 |
ZhangBiao
|
1e234c6aa8
|
【家园】材料不足突破红点修复
|
2022-01-13 18:26:39 +08:00 |
jiaoyangna
|
fe4c807633
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 16:41:45 +08:00 |
jiaoyangna
|
1515c59bac
|
法宝聚灵添加白金
|
2022-01-13 16:41:23 +08:00 |