Commit Graph

2881 Commits (d48458f4172b65f3ddd7d38ab6135eed183cdca1)

Author SHA1 Message Date
gaoxin d48458f417 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-26 14:33:21 +08:00
gaoxin a1778caa65 【公会红包】修复充值后报错扽问题 2021-03-26 14:33:12 +08:00
ZhangBiao ad3b3c3e45 【牛气冲不动了】 2021-03-26 14:05:25 +08:00
ZhangBiao dc187723c8 【牛气冲天】upview修改2
(cherry picked from commit 5d33070a00ca7b5c337522e0eb1b94cac304391e)
2021-03-26 14:00:30 +08:00
ZhangBiao b7cff350f9 【牛气冲天】修改 2021-03-26 13:56:01 +08:00
ZhangBiao 3c31b5b5bd Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-26 13:49:56 +08:00
ZhangBiao dc50f89214 【牛气冲天】upview提交 2021-03-26 13:49:41 +08:00
gaoxin b18ad8487a 【战斗】casting层级调整,失败界面打开1秒后才能关闭 2021-03-26 12:15:48 +08:00
gaoxin cb15f601b3 【聊天】去除登录之前的消息不显示的限制 2021-03-26 11:31:14 +08:00
gaoxin 1801a3d820 【十绝阵】排名数据超过20,滑动时显示错误的问题 2021-03-26 11:17:46 +08:00
ZhangBiao b7c51cbf48 【牛气冲天】红点bug提交
(cherry picked from commit af8f9e0f409980ed6c85b205cb2c0503b4c9e301)
2021-03-25 16:33:33 +08:00
ZhangBiao 3b99759f6f 【牛气冲天】报空修复
(cherry picked from commit 756e920596af01046ab53a971423b77243a42678)
2021-03-25 15:20:19 +08:00
ZhangBiao 16853d09c3 【牛气冲天】物品特效、红点检测
(cherry picked from commit 11fb7cc1876c48ec26617da94405812861c4b4b1)
2021-03-25 15:02:13 +08:00
ZhangBiao 0a4d9a925b 【牛气冲天】主城报错提交 2021-03-25 11:35:25 +08:00
ZhangBiao 24fa8c17e2 Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-03-25 11:13:37 +08:00
ZhangBiao 304a175fc8 【牛气冲天】完成 2021-03-25 11:00:58 +08:00
ZhangBiao 5768d133f0 【牛气冲天】提交 2021-03-25 10:34:11 +08:00
ZhangBiao 3a5b35a399 【牛气冲天】提交 2021-03-25 09:58:36 +08:00
gaoxin 17f0a9ed1e 【bug】零元礼包不再算做充值,修复第一天领取零元礼包,第二天充值会解锁第二天的首充礼包,但不能领取的问题。同时修复领取0元礼包也会导致自动弹出首充的问题。 2021-03-24 21:06:02 +08:00
ZhangBiao e8219c11b0 【牛气冲天】提交 2021-03-24 20:19:40 +08:00
jiaoyangna f972b1646a 主题活动提交 2021-03-24 18:16:30 +08:00
jiaoyangna b0887238d0 主题活动修改提交 2021-03-24 18:01:33 +08:00
ZhangBiao 481540080b 【牛气冲天】提交 2021-03-24 17:06:20 +08:00
zhangqiang 6f0593707f 【十绝阵个人排行】不显示玩家名字 2021-03-24 16:32:31 +08:00
ZhangBiao b63845938a 【牛气冲天】提交 2021-03-24 13:43:56 +08:00
ZhangBiao 2c5159fc11 【五级图标显示】 2021-03-24 09:48:35 +08:00
jiaoyangna 3bd78655a2 灵兽提交 2021-03-23 20:33:21 +08:00
ZhangBiao c9670aae58 【五级前不显示任何活动】 2021-03-23 20:28:31 +08:00
gaoxin 8644d27aaa 【界面优化】部分界面显示优化修改 2021-03-23 17:26:16 +08:00
gaoxin c5d1dab173 【养成】升级时,战力光效层级不正确 2021-03-23 16:34:19 +08:00
zhangqiang 3618464a15 【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格 2021-03-23 16:22:57 +08:00
gaoxin 8b62a5cd43 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-23 16:15:40 +08:00
gaoxin 3a8a8ddeeb 【登录】流程修改,添加错误码处理 2021-03-23 16:15:32 +08:00
zhangqiang c4c5bb1074 【神将没有升级材料依旧会出现小红点】 2021-03-23 15:53:59 +08:00
zhangqiang a56d71c4f8 【公会副本】bug修改 2021-03-23 15:25:00 +08:00
gaoxin 96fb520ace 【百宝斋】竞技场赛季过渡以后,去百宝斋里点击下方大页签可以正常进入逐胜商店并购买,但是切换 逐胜/公会,这种小页签 就提示赛季已结束不让进 2021-03-23 11:17:55 +08:00
jiaoyangna cd984427c1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-23 11:00:25 +08:00
jiaoyangna b859239c90 首充跳转修改 2021-03-23 10:59:59 +08:00
ZhangBiao 83040f2c87 【主城】预设结构调整 2021-03-23 09:54:11 +08:00
ZhangBiao 7bac8e3d8c 【八日领奖】需要改成可查看宝箱 2021-03-22 20:56:36 +08:00
ZhangBiao dc38d33738 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 20:42:02 +08:00
ZhangBiao dcc09321dd 【自选宝箱】按钮覆盖修改 2021-03-22 20:41:51 +08:00
gaoxin 7fb9a6ea71 【战斗】主动上报日志功能关闭 2021-03-22 20:37:34 +08:00
ZhangBiao 207d85e2a2 【牛气冲天】提交 2021-03-22 20:08:18 +08:00
gaoxin d7ac77375f 【bug】修复公会boss点击挑战再返回伤害列表不显示的问题 2021-03-22 19:50:01 +08:00
gaoxin 3c98337b33 【bug】战斗跳过未解锁文字提示修改 2021-03-22 19:44:24 +08:00
gaoxin c3961b9501 【公会】邀请,红包,副本文字显示修改 2021-03-22 16:25:10 +08:00
gaoxin 4b8f5cd535 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 13:54:18 +08:00
gaoxin f2de4a8a53 【大闹天宫】圣物品质框默认+3 2021-03-22 13:54:14 +08:00
zhangqiang 830f7d3dd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 13:48:06 +08:00