JieLing
|
8df851509f
|
Merge branch 'china/dev' into china/test
|
2021-07-06 15:06:15 +08:00 |
zhangqiang
|
c66cd98958
|
【化虚坛】神将合成材料框没有隐藏bug
|
2021-07-06 14:53:15 +08:00 |
jiaoyangna
|
3219a1a2b8
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-06 14:43:45 +08:00 |
jiaoyangna
|
d55789480a
|
图片修改提交
|
2021-07-06 14:43:12 +08:00 |
jiaoyangna
|
8dfb6ac056
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 11:41:01 +08:00 |
jiaoyangna
|
cd8e1554de
|
图片提交
|
2021-07-06 11:22:53 +08:00 |
jiaoyangna
|
4ba69227f5
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 11:17:49 +08:00 |
JieLing
|
5ef6bc9365
|
Merge branch 'china/dev' into china/test
|
2021-07-06 10:37:02 +08:00 |
zhangqiang
|
d29613e32a
|
【缥缈之旅】替换资源
|
2021-07-06 10:22:17 +08:00 |
JieLing
|
0c0c757e11
|
Merge branch 'china/dev' into china/test
|
2021-07-05 19:57:45 +08:00 |
jiaoyangna
|
b36edb9ae9
|
资源导入工具修改提交
|
2021-07-05 18:52:37 +08:00 |
zhangqiang
|
d25b80dd1b
|
【缥缈之旅】bug
|
2021-07-05 18:01:31 +08:00 |
jiaoyangna
|
f63f411268
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 17:19:25 +08:00 |
jiaoyangna
|
bd030bedbc
|
神将来源 新人商城 描述修改
|
2021-07-05 17:18:49 +08:00 |
JieLing
|
f665b59a8d
|
Merge branch 'china/dev' into china/test
|
2021-07-05 16:44:21 +08:00 |
jiaoyangna
|
c6963b337c
|
添加音频导入工具
|
2021-07-05 16:43:19 +08:00 |
jiaoyangna
|
570db27b9f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 16:32:56 +08:00 |
jiaoyangna
|
bc4d6fb744
|
资源导入工具修改提交
(cherry picked from commit e587f6d35d7b4b592e1785c1aa9bc27c190a0e0e)
|
2021-07-05 16:32:40 +08:00 |
ZhangBiao
|
241f780a15
|
【心愿抽卡】概率显示修改
|
2021-07-05 16:31:13 +08:00 |
JieLing
|
f85a156910
|
Merge branch 'china/dev' into china/test
|
2021-07-05 15:58:49 +08:00 |
zhangqiang
|
632291a19c
|
【法宝归元】鸿蒙阵上的英雄归元法宝弹 null and 【灵兽山】长按升级弹服务器开小差
|
2021-07-05 15:34:42 +08:00 |
jiaoyangna
|
b7447f8d0e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 15:18:07 +08:00 |
jiaoyangna
|
39cf4372c5
|
心愿 up修改
|
2021-07-05 15:18:03 +08:00 |
ZhangBiao
|
729a016a45
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 15:13:46 +08:00 |
ZhangBiao
|
84b4277e44
|
【礼盒、特惠神装】bug修改
|
2021-07-05 15:13:37 +08:00 |
zhangqiang
|
73a4eee31b
|
【缥缈之旅】提交8
|
2021-07-05 15:04:46 +08:00 |
ZhangBiao
|
56d0cce1e4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 13:47:36 +08:00 |
ZhangBiao
|
673f8c24d5
|
【礼盒、神装】刷新
|
2021-07-05 13:47:27 +08:00 |
zhangqiang
|
8ba8c98345
|
【魂印穿戴】无尽副本注释魂印绑定英雄
|
2021-07-05 12:09:20 +08:00 |
jiaoyangna
|
1fedb95da6
|
主题活动 心愿招募 描述修改
|
2021-07-05 11:37:29 +08:00 |
jiaoyangna
|
0e7d7d6c93
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 11:29:48 +08:00 |
jiaoyangna
|
c038859400
|
【ID1017091】
【神将来源】跳转首充,来源界面自动关闭,再次打开情报界面自动弹出
|
2021-07-05 11:29:05 +08:00 |
ZhangBiao
|
c2384f1fbc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 11:28:28 +08:00 |
ZhangBiao
|
5173faa482
|
【主界面】右侧伸缩条
|
2021-07-05 11:28:18 +08:00 |
zhangqiang
|
ac7ab00c7e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-05 10:58:59 +08:00 |
zhangqiang
|
a938b217a1
|
【缥缈之旅】提交7
|
2021-07-05 10:58:41 +08:00 |
ZhangBiao
|
48e3b63a08
|
【特惠神装】界面逻辑修改
|
2021-07-05 10:57:47 +08:00 |
jiaoyangna
|
9fa4e26f7e
|
仙缘汇聚箱修改提交
|
2021-07-05 09:55:02 +08:00 |
JieLing
|
bf5c15a096
|
Merge branch 'china/dev' into china/test
|
2021-07-03 20:12:09 +08:00 |
zhangqiang
|
b519d3270c
|
【缥缈之旅】提交6
|
2021-07-03 20:02:13 +08:00 |
zhangqiang
|
de844aea18
|
【缥缈之旅】提交5
|
2021-07-03 19:23:15 +08:00 |
wangzhenxing
|
fd3b2c0ed6
|
[战斗]=============减怒数字图片字修改提交,生成材质球文本文件修改提交
|
2021-07-03 18:52:28 +08:00 |
wangzhenxing
|
7d9edd42dd
|
[ui]==============心魔试炼适配修改提交
|
2021-07-03 18:28:18 +08:00 |
wangzhenxing
|
7d91331f5f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-03 17:47:25 +08:00 |
wangzhenxing
|
bc5d3e2f45
|
[战斗]============减怒数字修改提交
|
2021-07-03 17:47:00 +08:00 |
zhangqiang
|
6d5d480543
|
【缥缈之旅】提交4
|
2021-07-03 17:46:44 +08:00 |
wangzhenxing
|
c082a3c3d6
|
【功能】===========心魔试炼预设修改
|
2021-07-03 17:24:46 +08:00 |
zhangqiang
|
c87576944f
|
【刷资源提交】
|
2021-07-03 17:02:18 +08:00 |
zhangqiang
|
fbda34d678
|
Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-07-03 16:53:42 +08:00 |
zhangqiang
|
6af4522342
|
【缥缈之旅】提交3
|
2021-07-03 16:49:13 +08:00 |