ZhangBiao
|
45c9c20dd6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 13:52:41 +08:00 |
ZhangBiao
|
63a1588f66
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-13 13:51:11 +08:00 |
gaoxin
|
c3e94843c6
|
打点事件新增
|
2020-10-13 11:35:32 +08:00 |
zhangqiang
|
af6186a43d
|
线上活动 森罗幻境达人前端修改2
|
2020-10-10 18:32:18 +08:00 |
zhangqiang
|
d2f9ffd2db
|
线上活动 森罗幻境达人前端显示
|
2020-10-10 14:51:50 +08:00 |
zhangqiang
|
eefc951468
|
提交
|
2020-09-30 11:45:49 +08:00 |
JieLing
|
0064670621
|
遴选提交
|
2020-09-30 11:44:00 +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 |
ZhangBiao
|
e98973ff5a
|
三界降魔
|
2020-09-24 20:47:16 +08:00 |
gaoxin
|
293a4baaa5
|
优化挂机时长特权显示,涉及表:PrivilegeTypeConfig
|
2020-09-24 19:16:38 +08:00 |
gaoxin
|
bda6ace7c9
|
添加公告显示控制字段,获取公告接口添加一些参数用于区分提审,测试和正式服
|
2020-09-24 17:26:27 +08:00 |
ZhangBiao
|
665a5483eb
|
三界降魔
|
2020-09-24 17:07:12 +08:00 |
ZhangBiao
|
551dcaa01d
|
三界降魔
|
2020-09-23 20:27:29 +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 |
zhangqiang
|
5f8b1027ee
|
线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-23 14:51:33 +08:00 |
jiaoyangna
|
89f937e9ac
|
破阵诛仙提交
|
2020-09-10 18:08:21 +08:00 |
zhangqiang
|
4bcb51e164
|
添加寻宝排行榜 和 巅峰赛赛季更新修改
|
2020-09-09 11:20:29 +08:00 |
gaoxin
|
0393da682c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:36:52 +08:00 |
gaoxin
|
b395ea2804
|
竞技场跳过30级后解锁
|
2020-09-08 20:16:14 +08:00 |
ZhangBiao
|
f56be71560
|
主题活动修改
|
2020-09-08 17:16:08 +08:00 |
gaoxin
|
32b8705ab1
|
引导战斗流程添加
|
2020-09-07 18:25:31 +08:00 |
gaoxin
|
4ca09780a0
|
引导添加检测类型
|
2020-09-05 17:24:46 +08:00 |
ZhangBiao
|
8232879006
|
车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
|
2020-09-04 14:30:39 +08:00 |
ZhangBiao
|
ca036d6d0a
|
天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
|
2020-09-03 18:16:20 +08:00 |
ZhangBiao
|
04b18aa4ad
|
竞技场有免费次数 时提示红点
|
2020-09-03 14:42:31 +08:00 |
ZhangBiao
|
c3b0f590d2
|
好友增加一键领取红点
|
2020-09-03 10:50:25 +08:00 |
ZhangBiao
|
e74c120d01
|
大闹天宫重置红点、无尽副本界面红点
|
2020-09-01 11:25:38 +08:00 |
ZhangBiao
|
01fc7cae51
|
森罗幻境奖励红点
|
2020-08-28 13:48:09 +08:00 |
ZhangBiao
|
811418e222
|
森罗 无尽红点
|
2020-08-27 13:59:14 +08:00 |
zhangqiang
|
63ce11cda4
|
替换底图
|
2020-08-26 15:18:44 +08:00 |
jiaoyangna
|
7f9c8122c4
|
跳转修改提交
|
2020-08-26 14:51:10 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
62a0d2f41a
|
帮助位置修改
|
2020-08-25 11:52:27 +08:00 |
jiaoyangna
|
5c62cc19a7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:38:31 +08:00 |
jiaoyangna
|
f3aca22b37
|
commit help_type
|
2020-08-25 11:38:23 +08:00 |
JieLing
|
c14f7c4526
|
美元资源替换,艺术字体添加,
|
2020-08-24 23:58:33 +08:00 |
gaoxin
|
e806410e8a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-24 15:25:23 +08:00 |
ZhangBiao
|
939fa0227a
|
无尽入口例会、化虚进入修复、剪影仙踪
|
2020-08-24 15:20:00 +08:00 |
gaoxin
|
395c41ef79
|
Merge branch 'temp' into master_develop
|
2020-08-24 14:36:54 +08:00 |
jiaoyangna
|
aebf37e150
|
云梦祈福提交
|
2020-08-22 20:26:11 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
zhangqiang
|
8f72af20cc
|
公会副本提交 达人排行修改
|
2020-08-22 18:03:43 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
zhangqiang
|
9aec7d16e8
|
公会副本提交
|
2020-08-22 15:34:02 +08:00 |
zhangqiang
|
e1b223e83f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/PrivilegeTypeConfig.xlsx
# data_execl/base_data/RewardGroup.xlsx
# data_execl/base_data/RewardItemConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
# data_execl/base_data/StoreConfig.xlsx
# data_execl/base_data/UIConfig.xlsx
|
2020-08-22 13:59:35 +08:00 |
zhangqiang
|
b279baaa41
|
公会副本提交
|
2020-08-22 13:49:47 +08:00 |
ZhangBiao
|
bbe2c8c1f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:30:50 +08:00 |