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 |
jiaoyangna
|
af8b461b50
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-10 16:39:53 +08:00 |
jiaoyangna
|
de81143689
|
积天豪礼修改
|
2020-10-10 16:39:30 +08:00 |
ZhangBiao
|
5b47c9c889
|
虚位以待字体颜色修改
|
2020-09-25 18:16:37 +08:00 |
ZhangBiao
|
af8e68da78
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-02 00:18:39 +08:00 |
ZhangBiao
|
90cab5221d
|
三界降魔
|
2020-10-02 00:18:17 +08:00 |
yuanshuai
|
9a5846943a
|
逍遥游入口界面预设脚本提交
|
2020-09-25 17:02:38 +08:00 |
gongjiawei
|
b475b1b159
|
音频更新
|
2020-09-25 17:02:14 +08:00 |
gongjiawei
|
d53b165d16
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 16:43:18 +08:00 |
gongjiawei
|
8fff93eccc
|
音频更新
|
2020-09-25 16:42:56 +08:00 |
gongjiawei
|
6948cb36b6
|
音频更新
|
2020-09-25 15:48:52 +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 |
liujiaqi
|
4f3b792b42
|
9.25更新,未同步到online,排名头像框123,
|
2020-09-25 14:11:05 +08:00 |
gaoxin
|
e320701f54
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 12:22:17 +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 |
gongjiawei
|
ab61345d6d
|
音频更新
|
2020-09-25 11:40:17 +08:00 |
zhangqiang
|
89a7256077
|
线上活动 : 四周活动 天宫达人 问题
|
2020-09-25 09:49:44 +08:00 |
ZhangBiao
|
e98973ff5a
|
三界降魔
|
2020-09-24 20:47:16 +08:00 |
gaoxin
|
dee65cf7e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
|
2020-09-24 20:26:20 +08:00 |
gaoxin
|
69563a13c7
|
每日一键购买礼包金额显示添加
|
2020-09-24 20:25:27 +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 |
jiaoyangna
|
c9c943da32
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 17:53:53 +08:00 |
jiaoyangna
|
bfc32b4541
|
百宝商会时间修改
|
2020-09-24 17:53:48 +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 |