gaoxin
|
36ebddb517
|
物品框添加头像框的特效
|
2020-09-27 15:04:12 +08:00 |
gaoxin
|
96ac81c098
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-27 13:33:39 +08:00 |
gaoxin
|
525e229273
|
部分界面头像特效添加
|
2020-09-27 13:33:10 +08:00 |
ZhangBiao
|
11b0361f15
|
Revert "社稷大典 占坑"
This reverts commit 28bd8d4e73.
|
2020-09-27 11:16:27 +08:00 |
ZhangBiao
|
b606b87bb2
|
Revert ""
This reverts commit d527c81d11.
|
2020-09-27 11:16:21 +08:00 |
ZhangBiao
|
62300c0bff
|
|
2020-09-27 10:15:40 +08:00 |
ZhangBiao
|
a97d8c4348
|
社稷大典 占坑
|
2020-09-27 10:10:16 +08:00 |
jiaoyangna
|
278d9f8943
|
碎片属性图片修改提交
|
2020-09-25 23:09:48 +08:00 |
ZhangBiao
|
90cab5221d
|
三界降魔
|
2020-10-02 00:18:17 +08:00 |
ZhangBiao
|
9b9c094f3b
|
Merge branch '0活动开发聚集地/三界除魔' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2020-09-25 15:28:37 +08:00 |
ZhangBiao
|
bec9ecf6d3
|
三界降魔
|
2020-09-25 15:24:59 +08:00 |
jiaoyangna
|
afc1d269c2
|
限时折扣提交
|
2020-09-25 15:03:12 +08:00 |
jiaoyangna
|
9937a05d97
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 14:59:27 +08:00 |
jiaoyangna
|
cae421024a
|
积天豪礼添加动画
|
2020-09-25 14:59:05 +08:00 |
zhangqiang
|
f960264667
|
线上 : 战力计算 注释 VIP属性加成
|
2020-09-25 14:49:58 +08:00 |
gaoxin
|
ac15a97977
|
战斗专属log添加,删除部分无用打印,添加死亡技能检测队列保证死亡技能的优先级最高。
|
2020-09-25 12:22:12 +08:00 |
jiaoyangna
|
49d55c763e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 23:15:11 +08:00 |
jiaoyangna
|
fd4491e5db
|
挂机时间显示
|
2020-09-25 23:15:06 +08:00 |
zhangqiang
|
89a7256077
|
线上活动 : 四周活动 天宫达人 问题
|
2020-09-25 09:49:44 +08:00 |
ZhangBiao
|
e98973ff5a
|
三界降魔
|
2020-09-24 20:47:16 +08:00 |
jiaoyangna
|
2e21ef95ef
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 20:15:50 +08:00 |
jiaoyangna
|
aa4e005be9
|
【青龙秘宝显示优化】修改进入青龙秘宝时自动滑动的位置
|
2020-09-24 20:15:25 +08:00 |
gaoxin
|
e4c274d15c
|
每日一键购买礼包金额显示添加
|
2020-09-24 20:02:27 +08:00 |
gaoxin
|
142d8ccf0e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 19:16:43 +08:00 |
gaoxin
|
293a4baaa5
|
优化挂机时长特权显示,涉及表:PrivilegeTypeConfig
|
2020-09-24 19:16:38 +08:00 |
zhangqiang
|
31d460114b
|
测试
|
2020-09-24 18:34:31 +08:00 |
jiaoyangna
|
1252d11135
|
漏提
|
2020-09-24 18:10:10 +08:00 |
jiaoyangna
|
d600c57b0f
|
【挂机宝箱优化】挂机宝箱上显示当前挂机时长,精确到分
|
2020-09-24 17:55:36 +08:00 |
ZhangBiao
|
442ac463c0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 17:45:26 +08:00 |
ZhangBiao
|
27568910c4
|
在线奖励 一键领取按钮 在线不刷新修复
|
2020-09-24 17:44:50 +08:00 |
gaoxin
|
02f50abafd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 17:26:34 +08:00 |
gaoxin
|
bda6ace7c9
|
添加公告显示控制字段,获取公告接口添加一些参数用于区分提审,测试和正式服
|
2020-09-24 17:26:27 +08:00 |
zhangqiang
|
65e5b41dee
|
竞技场排序 车迟抢夺排序 试炼节点缩小
|
2020-09-24 17:15:57 +08:00 |
ZhangBiao
|
665a5483eb
|
三界降魔
|
2020-09-24 17:07:12 +08:00 |
gaoxin
|
3462835c8f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 16:29:55 +08:00 |
gaoxin
|
7958c3cf44
|
取消重复下单的判断,收不到支付回调时会导致该礼包无法再次购买,正式服已修复
|
2020-09-24 16:29:51 +08:00 |
gaoxin
|
e0caaf8ade
|
开服狂欢登录奖励内容及按钮显示逻辑修改,涉及表格:TreasureTaskConfig
|
2020-09-24 16:26:33 +08:00 |
gaoxin
|
ae25bcb07e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 15:33:58 +08:00 |
gaoxin
|
58158755e3
|
修复抽卡界面特效穿透的问题
|
2020-09-24 15:33:39 +08:00 |
jiaoyangna
|
43a49dee67
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 15:33:03 +08:00 |
jiaoyangna
|
11cb6221f5
|
时间修改
|
2020-09-24 15:32:44 +08:00 |
gaoxin
|
504b525001
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 14:49:02 +08:00 |
jiaoyangna
|
d2c7754349
|
【破阵诛仙】每日任务刷新,剩余时间小于1小时显示分钟 幸运探宝刷新时间显示
|
2020-09-24 14:09:32 +08:00 |
gaoxin
|
d7aabf6a70
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 13:39:05 +08:00 |
gaoxin
|
f677614c90
|
修复轩辕宝镜界面第第二次打开没有货币栏的问题
|
2020-09-24 13:38:59 +08:00 |
zhangqiang
|
1e9443b288
|
线上问题 : 提示挑战关卡升级被聊天遮挡
|
2020-09-24 12:53:39 +08:00 |
zhangqiang
|
7a77b968ad
|
线上问题 : 线上问题 招募英雄法宝数据有可能报错
|
2020-09-24 12:52:57 +08:00 |
jiaoyangna
|
34cc05a87d
|
青龙秘宝周任务修改,
|
2020-10-02 22:09:01 +08:00 |
jiaoyangna
|
a26839253f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-02 18:42:27 +08:00 |
jiaoyangna
|
5c9fcf1c44
|
跳转限时兑换修改
|
2020-10-02 18:41:55 +08:00 |
ZhangBiao
|
551dcaa01d
|
三界降魔
|
2020-09-23 20:27:29 +08:00 |
gaoxin
|
97b80070ff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-23 17:07:00 +08:00 |
gaoxin
|
f3df717172
|
优化邮件列表中邮件标题的显示
|
2020-09-23 16:58:56 +08:00 |
jiaoyangna
|
4389beca87
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-23 16:56:53 +08:00 |
jiaoyangna
|
2269c50897
|
【活动需求】百宝商会,免费礼包红点
|
2020-09-23 16:56:06 +08:00 |
zhangqiang
|
121901c06e
|
线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表
|
2020-09-23 15:49:48 +08:00 |
ZhangBiao
|
05fee33df9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-23 15:05:29 +08:00 |
ZhangBiao
|
999ade9823
|
三界除魔 占个坑
|
2020-09-23 15:04:41 +08:00 |
ZhangBiao
|
772ae238ed
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 17:32:41 +08:00 |
ZhangBiao
|
7e099596d3
|
限时商市 其珍宝阁 多期机制增加
|
2020-09-25 16:42:25 +08:00 |
zhangqiang
|
5f8b1027ee
|
线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-23 14:51:33 +08:00 |
jiaoyangna
|
543540cd26
|
【查看神将】切换查看的神将时,魂印图标显示不正确
|
2020-09-23 11:39:54 +08:00 |
jiaoyangna
|
e3a34ea941
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-22 18:38:42 +08:00 |
jiaoyangna
|
a9389ec427
|
免费礼包修改
|
2020-09-22 18:38:22 +08:00 |
gaoxin
|
35a4c61b42
|
修复魂印图鉴界面销毁后再次打开报错的问题
|
2020-09-22 16:59:23 +08:00 |
jiaoyangna
|
1651407fa4
|
漏提
|
2020-09-14 05:08:53 +08:00 |
jiaoyangna
|
5f5f6cb50a
|
【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失
|
2020-09-14 05:01:10 +08:00 |
jiaoyangna
|
9771ac2838
|
漏提
|
2020-09-22 14:43:22 +08:00 |
jiaoyangna
|
e5f3cd8e23
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-22 11:58:54 +08:00 |
jiaoyangna
|
2e1515daa4
|
青龙秘宝入口修改
|
2020-09-22 11:58:49 +08:00 |
jiaoyangna
|
1d64b76c5a
|
【破阵诛仙】点金达人任务,跳转点金,不计数
|
2020-09-22 11:57:00 +08:00 |
zhangqiang
|
7f0d2d4926
|
线上问题: 大闹天宫节点例会重叠
|
2020-09-22 11:39:05 +08:00 |
zhangqiang
|
fd5358120e
|
线上问题: 试炼节点显示立绘与招募得到的不一致 前端修改
|
2020-09-21 18:44:20 +08:00 |
zhangqiang
|
fdd3398704
|
线上问题 : 一键编队上阵了归元后战力低的英雄
|
2020-09-21 18:03:44 +08:00 |
gaoxin
|
406426a6e0
|
修改tapdb设置服务器数据的调用位置
|
2020-09-21 12:11:26 +08:00 |
wangzhenxing
|
d6f220623f
|
【ID1009487】
【圣物】ID10 战斗开始回血,没有表现
|
2020-09-21 10:07:30 +09:00 |
jiaoyangna
|
cfd1f8d51b
|
添加动画
|
2020-09-18 13:43:52 +08:00 |
gaoxin
|
2eeb4af779
|
修复切磋战斗结果只会显示失败的问题
|
2020-09-17 16:23:26 +08:00 |
zhangqiang
|
d700e0da1c
|
打开充值每日礼包 和 成长礼包 红点检测
|
2020-09-17 14:16:04 +08:00 |
ZhangBiao
|
4041b229cc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-17 12:22:19 +08:00 |
ZhangBiao
|
e13026857d
|
限时兑换onhide function增加
|
2020-09-17 09:49:43 +08:00 |
zhangqiang
|
cbdac88541
|
xuanyuan commit
|
2020-09-16 19:24:32 +08:00 |
zhangqiang
|
b00d112660
|
xuanyaun commit
|
2020-09-16 18:54:48 +08:00 |
zhangqiang
|
d423f61e4b
|
轩辕commit
|
2020-09-16 18:48:21 +08:00 |
zhangqiang
|
97b10ca124
|
打印
|
2020-09-16 18:36:41 +08:00 |
ZhangBiao
|
e6b1832121
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 18:18:36 +08:00 |
ZhangBiao
|
6be45b4e89
|
幸运探宝增加动效
|
2020-09-16 18:18:07 +08:00 |
wangxiaolong
|
293ac2b2f2
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 14:45:28 +08:00 |
wangxiaolong
|
209ba84534
|
添加冗余代码调用 + 修改私有方法名称
|
2020-09-16 14:45:10 +08:00 |
ZhangBiao
|
60a335684d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 14:09:41 +08:00 |
ZhangBiao
|
5cd8e621dc
|
限时活动,限时兑换、礼包抢购增加动效
|
2020-09-16 14:09:31 +08:00 |
jiaoyangna
|
568d7c8ee2
|
万象境入口修改
|
2020-09-16 11:26:06 +08:00 |
ZhangBiao
|
60172f3089
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 10:52:16 +08:00 |
ZhangBiao
|
13fff17277
|
在线奖励一键领取
|
2020-09-16 10:52:09 +08:00 |
zhangqiang
|
7332783723
|
音效修改
|
2020-09-16 10:26:34 +08:00 |
zhangqiang
|
e5c91eff67
|
音效
|
2020-09-16 10:14:43 +08:00 |
jiaoyangna
|
b202a02455
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-18 18:34:14 +08:00 |
jiaoyangna
|
35c5de3561
|
适配修改提交
|
2020-09-18 18:34:02 +08:00 |
jiaoyangna
|
52d4ff90c5
|
修改标题
|
2020-09-18 18:17:35 +08:00 |
zhangqiang
|
eab93ec002
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-15 18:16:09 +08:00 |