Commit Graph

5135 Commits (30ab410f000dece529076305c703913c05148802)

Author SHA1 Message Date
jiaoyangna 30ab410f00 抽卡优化 2021-07-08 18:40:43 +08:00
jiaoyangna 6ea9ee51c0 玉皇大帝修改提交 2021-07-08 18:29:28 +08:00
jiaoyangna c72ccc962b 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-07 11:53:23 +08:00
jiaoyangna 8ec0256d78 排序修改提交 2021-07-07 11:44:40 +08:00
jiaoyangna fd9f4248b6 百宝商会文字错乱修改 2021-07-07 11:30:21 +08:00
jiaoyangna 7aa590621c 百宝商会文字错乱修改 2021-07-07 11:28:50 +08:00
jiaoyangna 05ef24c89c 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-06 19:01:27 +08:00
jiaoyangna 735f694270 隐藏页签 2021-07-06 17:04:36 +08:00
jiaoyangna 13905916d1 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 16:48:59 +08:00
jiaoyangna bc34bdce69 【ID1009609】
【优化】无尽副本优化
2021-07-06 15:19:56 +08:00
jiaoyangna 3219a1a2b8 【ID1009609】
【优化】无尽副本优化
2021-07-06 14:43:45 +08:00
jiaoyangna 8dfb6ac056 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:41:01 +08:00
jiaoyangna 4ba69227f5 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:17:49 +08:00
zhangqiang d29613e32a 【缥缈之旅】替换资源 2021-07-06 10:22:17 +08:00
zhangqiang d25b80dd1b 【缥缈之旅】bug 2021-07-05 18:01:31 +08:00
jiaoyangna bd030bedbc 神将来源 新人商城 描述修改 2021-07-05 17:18: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
zhangqiang b519d3270c 【缥缈之旅】提交6 2021-07-03 20:02:13 +08:00
zhangqiang de844aea18 【缥缈之旅】提交5 2021-07-03 19:23:15 +08:00
wangzhenxing 7d9edd42dd [ui]==============心魔试炼适配修改提交 2021-07-03 18:28:18 +08:00
zhangqiang 6d5d480543 【缥缈之旅】提交4 2021-07-03 17:46:44 +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
gaoxin 5458cd2889 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-03 15:27:09 +08:00
gaoxin f75b844961 【拍脸】修复偶现栈空报错 2021-07-03 15:26:58 +08:00
wangzhenxing 802f41cadd Merge branch 'china/dev-c-battle' into china/dev 2021-07-03 14:18:37 +08:00
zhangqiang 2f269ebfa8 【缥缈之旅】提交2 2021-07-03 12:37:56 +08:00
wangzhenxing 94dde31cf9 [战斗]====中毒伤害图片字提交 2021-07-02 19:12:09 +08:00
ZhangBiao 3d462c708f 【站内信】排序 2021-07-02 16:27:36 +08:00
ZhangBiao ee1da4348c 【站内信】协议漏题 2021-07-02 16:10:47 +08:00
jiaoyangna eed42686ad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 14:50:45 +08:00
jiaoyangna d49f3c8e54 Revert "每日商店特效删除"
This reverts commit 64382c68c3.
2021-07-02 14:50:31 +08:00
wangzhenxing 338ab55daa 【战斗】=========新增336被动 2021-07-02 14:49:28 +08:00