gaoxin
|
5a66722aed
|
【无尽副本】优化清除缓存第一次进入无尽副本时任务状态错误
|
2022-01-19 18:32:43 +08:00 |
ZhangBiao
|
908cee1961
|
【神将信息】图鉴信息便宜修改
|
2022-01-19 18:30:09 +08:00 |
wangzhenxing
|
7fd7ef19f3
|
[飞升]====卡牌背景修改
|
2022-01-19 17:50:39 +08:00 |
jiaoyangna
|
a797e80b39
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-19 17:47:28 +08:00 |
jiaoyangna
|
a544abe9cc
|
众志成城
|
2022-01-19 17:47:07 +08:00 |
wangzhenxing
|
73ccdca2aa
|
[飞升]=====资源提交
|
2022-01-19 17:22:30 +08:00 |
wangzhenxing
|
6ef00a4498
|
[飞升]=====细节调整
|
2022-01-19 16:57:17 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
jiaoyangna
|
c7bc81f19f
|
协议提交
|
2022-01-19 15:57:01 +08:00 |
wangzhenxing
|
0fd8ea0add
|
[飞升]=======特效资源提交
|
2022-01-19 15:36:17 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
gaoxin
|
35648e8762
|
【升级】长按升到最大级了,会无法触发抬起事件,导致升级失败
|
2022-01-19 15:22:11 +08:00 |
ZhangBiao
|
60df01190d
|
【家园】资源替换
|
2022-01-18 15:19:19 +08:00 |
gaoxin
|
155dabe7c7
|
【专属升星】选择神将界面打不开
|
2022-01-18 15:07:14 +08:00 |
jiaoyangna
|
76295739f3
|
【ID1019513】
【品质调整】神将技能弹窗,不关闭也可以点返回
|
2022-01-18 15:01:01 +08:00 |
jiaoyangna
|
b5cc0635ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 14:49:50 +08:00 |
jiaoyangna
|
ac24c2e0ce
|
【ID1010998】
【春节活动】签到领奖活动
|
2022-01-18 14:48:27 +08:00 |
ZhangBiao
|
54aeaa2ea8
|
【寻仙招募】提交
|
2022-01-18 12:09:43 +08:00 |
wangzhenxing
|
ff5866e00e
|
[法宝详情]=======添加返回按钮
|
2022-01-18 11:57:38 +08:00 |
wangzhenxing
|
4298209c33
|
[战斗]=======护盾buff修改
|
2022-01-18 11:44:36 +08:00 |
gaoxin
|
925db190ee
|
【引导】修复挂机界面打开时触发引导小手不消失的问题
|
2022-01-18 11:38:00 +08:00 |
ZhangBiao
|
558bbfdee1
|
【鸿蒙阵】报错提交
|
2022-01-18 11:20:55 +08:00 |
ZhangBiao
|
4d7c72725a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-18 10:57:09 +08:00 |
ZhangBiao
|
6283677b8f
|
【诸多修改】提交
|
2022-01-18 10:53:25 +08:00 |
wangzhenxing
|
7f9868ca59
|
[bug]=====奖池预览修改,图鉴详情添加点击反馈
|
2022-01-18 10:45:39 +08:00 |
ZhangBiao
|
fc318e7d44
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-18 10:19:50 +08:00 |
ZhangBiao
|
b316eccd7c
|
【装备】摘星阁属性
|
2022-01-18 10:19:36 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
wangzhenxing
|
2e0bd1ded7
|
[飞升]=======显示修改
|
2022-01-18 09:47:38 +08:00 |
gaoxin
|
0456081d65
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 18:27:24 +08:00 |
gaoxin
|
a44c0cffab
|
【资源】临时技能图标优化
|
2022-01-17 18:27:10 +08:00 |
ZhangBiao
|
f20f722177
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 18:24:12 +08:00 |
ZhangBiao
|
bf3ca7ef08
|
【装备加持】鸿蒙阵共鸣出的装备未受到装备加持加成
|
2022-01-17 18:22:45 +08:00 |
wangzhenxing
|
1de7293630
|
[飞升]======卡牌飞升预设修改
|
2022-01-17 16:53:26 +08:00 |
gaoxin
|
b7055edd5e
|
【图鉴】神将信息屏幕适配修改
|
2022-01-17 16:08:52 +08:00 |
wangzhenxing
|
d5fd95373f
|
[抽卡奖池]======抽卡奖池预览修改
|
2022-01-17 15:56:27 +08:00 |
wangzhenxing
|
ea10cd65d1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 14:26:54 +08:00 |
ZhangBiao
|
369f7aa1ef
|
【点将台】选择心愿神将,列表动画不正常
|
2022-01-17 14:26:17 +08:00 |
wangzhenxing
|
f257bc2c6d
|
[图鉴]=====图鉴神魂按钮显示修改
|
2022-01-17 14:26:17 +08:00 |
ZhangBiao
|
ae020064ab
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 14:10:19 +08:00 |
ZhangBiao
|
4e00c5e9c3
|
【名望礼包】红点
|
2022-01-17 14:10:08 +08:00 |
jiaoyangna
|
d0023bbcdf
|
神魂显示修改提交
|
2022-01-17 13:56:06 +08:00 |
jiaoyangna
|
7d0c4e21d0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:24:04 +08:00 |
jiaoyangna
|
5bd09017e0
|
掩藏神魂
|
2022-01-17 13:23:19 +08:00 |
ZhangBiao
|
e3196e3ca2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:16:30 +08:00 |
ZhangBiao
|
409836ffb5
|
【名望礼包】提交
|
2022-01-17 13:16:18 +08:00 |
jiaoyangna
|
a4cbd77a99
|
许愿神将修改提交
|
2022-01-17 11:23:22 +08:00 |
jiaoyangna
|
4c1b1dbc30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:19:23 +08:00 |
jiaoyangna
|
4abe2d4203
|
Revert "许愿神将修改提交"
This reverts commit fbd1c9aa43 .
|
2022-01-17 11:18:55 +08:00 |
gaoxin
|
58b5702a30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:06:41 +08:00 |