jiaoyangna
|
8166db38d5
|
【幸运探宝优化】界面显示规则优化
|
2021-05-12 18:36:29 +08:00 |
ZhangBiao
|
d5799c1030
|
【修行】神印界面提交
|
2021-05-12 18:24:50 +08:00 |
jiaoyangna
|
20b5ded8e9
|
修改add 为addOnce
(cherry picked from commit 14b1420d14)
|
2021-05-12 17:42:51 +08:00 |
jiaoyangna
|
5817146b6f
|
主题活动修改提交
(cherry picked from commit 0b5177748b)
|
2021-05-12 17:41:19 +08:00 |
ZhangBiao
|
7d63d1e191
|
【修行】提交
|
2021-05-12 17:40:38 +08:00 |
jiaoyangna
|
06fb7e218f
|
主题活动提交
(cherry picked from commit 847adfc761)
|
2021-05-12 17:39:46 +08:00 |
jiaoyangna
|
5eed825a7c
|
活动主界面修改提交
(cherry picked from commit 3fffdd9cd3)
|
2021-05-12 17:38:12 +08:00 |
jiaoyangna
|
3c04e8dbe1
|
[主题活动修改提交]
(cherry picked from commit f88ccd8f68)
|
2021-05-12 17:37:59 +08:00 |
jiaoyangna
|
778f2360a7
|
【幸运探宝优化】界面显示规则优化
|
2021-05-12 17:07:43 +08:00 |
jiaoyangna
|
1e83996522
|
【活动优化】百宝商会增加一键购买,礼包金额及奖励变更
|
2021-05-12 15:25:54 +08:00 |
jiaoyangna
|
90b59093f0
|
修改礼包预设
|
2021-05-12 14:41:00 +08:00 |
jiaoyangna
|
14b1420d14
|
修改add 为addOnce
|
2021-05-12 14:38:45 +08:00 |
jiaoyangna
|
71f42b1526
|
添加表
|
2021-05-12 13:55:08 +08:00 |
jiaoyangna
|
c54c0b547d
|
服务器状态错误添加容错
|
2021-05-12 13:53:06 +08:00 |
jiaoyangna
|
214c971c41
|
Merge branch '0活动开发聚集地/new主题活动' into china/dev-c
|
2021-05-12 11:21:28 +08:00 |
jiaoyangna
|
e9d548d5b6
|
【活动优化】每日豪礼界面优化调整
|
2021-05-12 11:16:33 +08:00 |
jiaoyangna
|
4c41ca0572
|
音效提交
(cherry picked from commit 5a19a26d943af8465f22614548083da158ee8c85)
|
2021-05-12 11:07:44 +08:00 |
jiaoyangna
|
0843bb8c4e
|
音效提交
(cherry picked from commit 44cc010a8a26b372fefd28e09414bfa641e90100)
|
2021-05-12 11:07:36 +08:00 |
jiaoyangna
|
16a67e5190
|
【活动优化】每日豪礼界面优化调整
|
2021-05-12 10:47:48 +08:00 |
ZhangBiao
|
92b22fdc0c
|
【修行】提交
|
2021-05-12 10:35:58 +08:00 |
zhangqiang
|
1ed38be14a
|
【山河社稷图】提交
|
2021-05-11 20:20:38 +08:00 |
ZhangBiao
|
7ba5209394
|
【修行】提交
|
2021-05-11 17:23:19 +08:00 |
wangzhenxing
|
32d592b7bc
|
[战斗]====精英副本相关修改提交
|
2021-05-11 17:05:11 +08:00 |
gaoxin
|
b7b3f610ed
|
【翻译文字导出】
|
2021-05-11 17:03:09 +08:00 |
jiaoyangna
|
dc66043a06
|
【活动优化】百宝商会增加一键购买,礼包金额及奖励变更
|
2021-05-11 16:59:48 +08:00 |
zhangqiang
|
410f679e68
|
【山河社稷图】提交
|
2021-05-11 16:58:01 +08:00 |
gaoxin
|
913e10a309
|
【资源】修复小人乘坐骑时显示错误的问题
|
2021-05-11 16:20:32 +08:00 |
zhangqiang
|
effe90990f
|
【山河社稷图】提交
|
2021-05-11 15:12:37 +08:00 |
ZhangBiao
|
7104d77d7e
|
【修行】开坑
|
2021-05-11 15:09:25 +08:00 |
jiaoyangna
|
0b5177748b
|
主题活动修改提交
|
2021-05-11 14:59:41 +08:00 |
ZhangBiao
|
267963abc4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-11 13:50:50 +08:00 |
ZhangBiao
|
e167fbbc1b
|
【灵兽宝阁】概率公示描述优化
|
2021-05-11 13:50:42 +08:00 |
gaoxin
|
58618e2062
|
【帮助】修复界面可以穿透点击事件的问题
|
2021-05-11 11:06:41 +08:00 |
gaoxin
|
2db750da5d
|
【灵兽】修复获得灵兽时,物品无点击事件的问题
|
2021-05-11 10:32:21 +08:00 |
ZhangBiao
|
7ec3ae01f6
|
【升级限量礼包】无剩余礼包逻辑缺失修复
|
2021-05-11 10:08:09 +08:00 |
jiaoyangna
|
847adfc761
|
主题活动提交
|
2021-05-10 20:20:20 +08:00 |
ZhangBiao
|
165c8650a7
|
【恭喜获得】背包已满会弹空的恭喜获得2
|
2021-05-10 16:20:41 +08:00 |
ZhangBiao
|
ea33322ce8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-10 16:12:19 +08:00 |
ZhangBiao
|
181306059d
|
【恭喜获得】背包已满会弹空的恭喜获得
|
2021-05-10 16:12:09 +08:00 |
jiaoyangna
|
4447f37b62
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-10 15:05:31 +08:00 |
jiaoyangna
|
fb5f703272
|
限时兑换提交
|
2021-05-10 15:05:27 +08:00 |
gaoxin
|
b4834ba2cc
|
【图鉴】信息界面定位按钮走表配置
|
2021-05-10 10:57:06 +08:00 |
jiaoyangna
|
3fffdd9cd3
|
活动主界面修改提交
|
2021-05-10 10:52:44 +08:00 |
ZhangBiao
|
16e5b894e3
|
【天尊降世】增加第三个奖励红点
|
2021-05-10 10:35:08 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +08:00 |
ZhangBiao
|
1c9ae3884b
|
【花虚坛】置换界面空白修复
|
2021-05-08 14:31:35 +08:00 |
ZhangBiao
|
40bc700f65
|
【累充】周刷新的累充,页签会显示每日累充
|
2021-05-08 12:01:18 +08:00 |
ZhangBiao
|
b88d05061c
|
【点金达人】在活动界面跳转点金,需要切换页签,次数才会刷新
|
2021-05-08 11:45:05 +08:00 |
ZhangBiao
|
9fda08c7ba
|
【碎片合成】神将达上限,选择合成数量时没有合理提示
|
2021-05-08 11:03:46 +08:00 |
zhangqiang
|
1745c20ab0
|
【山河社稷图】提交
|
2021-05-07 20:24:41 +08:00 |
jiaoyangna
|
fb51497d38
|
主题活动提交
|
2021-05-07 18:05:09 +08:00 |
jiaoyangna
|
25cfb730b6
|
灵兽特惠提交
|
2021-05-07 17:49:23 +08:00 |
jiaoyangna
|
21e5c3b78d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-07 17:01:34 +08:00 |
jiaoyangna
|
dd862760cd
|
图片修改提交
|
2021-05-07 17:00:54 +08:00 |
ZhangBiao
|
bad91c3b25
|
【月卡】月卡界面关闭后报错修改
|
2021-05-07 16:39:23 +08:00 |
ZhangBiao
|
02be5bb730
|
【森罗幻境】boss不生成修改
|
2021-05-07 15:10:06 +08:00 |
zhangqiang
|
1db33218d8
|
【山河社稷图】首提
|
2021-05-07 14:44:50 +08:00 |
ZhangBiao
|
782588b1ef
|
【森罗幻境】修复打boss弹出恭喜获得弹窗
|
2021-05-07 11:43:37 +08:00 |
jiaoyangna
|
c6a5a7ce01
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-07 11:02:14 +08:00 |
jiaoyangna
|
ff8b9b57cc
|
限时up 提交
|
2021-05-07 11:01:33 +08:00 |
ZhangBiao
|
04e3fec068
|
【灵兽宝阁】有免费抽的时候不显示倒计时
|
2021-05-07 10:55:04 +08:00 |
jiaoyangna
|
8e44dca9b5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-06 18:22:48 +08:00 |
jiaoyangna
|
885c8bc53c
|
限时兑换在两个活动里出现修改
|
2021-05-06 18:22:15 +08:00 |
zhangqiang
|
601f5c09b9
|
【拍脸】修改
|
2021-05-06 18:08:53 +08:00 |
jiaoyangna
|
7ec568e48d
|
新添加主题活动限时兑换跳转
|
2021-05-06 17:49:43 +08:00 |
gaoxin
|
d574d2ee2a
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-30 16:36:09 +08:00 |
gaoxin
|
9a8ee6cda4
|
【资源】玉皇大帝音效资源提交
|
2021-04-30 16:34:34 +08:00 |
jiaoyangna
|
412a4ec851
|
没有找到剧情继续执行,不卡死
|
2021-04-30 16:13:00 +08:00 |
jiaoyangna
|
d2dd36101e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-30 15:30:06 +08:00 |
jiaoyangna
|
6fc61a91e4
|
图片修改提交
|
2021-04-30 15:30:01 +08:00 |
ZhangBiao
|
252454272a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-30 15:27:57 +08:00 |
ZhangBiao
|
81b82ea509
|
【云游商人】跨天红点不刷新修改
|
2021-04-30 15:27:47 +08:00 |
gaoxin
|
65454a8e23
|
【bug】车迟斗法挑战报错,再次延长天尊降世的可关闭时间
|
2021-04-30 14:07:24 +08:00 |
gaoxin
|
7c54586379
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-30 12:43:11 +08:00 |
jiaoyangna
|
08ef62eb2b
|
至尊降世 前往修改
|
2021-04-30 12:42:31 +08:00 |
gaoxin
|
0f01c9eb2b
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-30 12:40:23 +08:00 |
ZhangBiao
|
7711c08fbe
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-30 11:49:55 +08:00 |
ZhangBiao
|
1980c01573
|
【竞技场】时间到弹出
|
2021-04-30 11:49:45 +08:00 |
gaoxin
|
de827b3ae3
|
【至尊降世】延时四秒后才能关闭界面否则会出现立绘消失的问题
|
2021-04-30 11:29:40 +08:00 |
gaoxin
|
72ab9438d1
|
【关卡】修复突破第一章最后一关进入第二章时,切换地图出现黑屏
|
2021-04-30 11:22:19 +08:00 |
gaoxin
|
e4b747c2bc
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-30 11:21:54 +08:00 |
wangzhenxing
|
d4a0a902bd
|
聊天界面称号特效显示修改
|
2021-04-30 11:17:02 +08:00 |
jiaoyangna
|
b3ca5ee026
|
剧情提交
(cherry picked from commit 6c673de50a)
|
2021-04-30 09:51:23 +08:00 |
jiaoyangna
|
6c673de50a
|
剧情提交
|
2021-04-30 09:50:35 +08:00 |
gaoxin
|
dbbf02f48d
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-29 21:28:31 +08:00 |
jiaoyangna
|
1ab93a245a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 21:17:45 +08:00 |
jiaoyangna
|
a26b2b7829
|
公会刷新时间修改
|
2021-04-29 21:17:40 +08:00 |
gaoxin
|
4a9cdc80fa
|
【资源】资源名重复修整
|
2021-04-29 21:08:11 +08:00 |
gaoxin
|
a26bdd837e
|
【资源】遗漏资源补齐
|
2021-04-29 20:53:00 +08:00 |
gaoxin
|
3c251062ea
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 20:48:44 +08:00 |
gaoxin
|
0b260fd03a
|
【资源】至尊降世资源修改
|
2021-04-29 20:48:39 +08:00 |
jiaoyangna
|
b66367fd85
|
修改对话出现时间
|
2021-04-29 20:20:37 +08:00 |
gaoxin
|
5f09e64257
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 20:19:10 +08:00 |
jiaoyangna
|
3578f57882
|
关闭假战斗回放
|
2021-04-29 20:16:37 +08:00 |
jiaoyangna
|
8e976f0cab
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 19:44:54 +08:00 |
jiaoyangna
|
45eef519df
|
战斗剧情播放两边修改
|
2021-04-29 19:44:41 +08:00 |
jiaoyangna
|
fd79af8e4b
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-29 19:38:26 +08:00 |
jiaoyangna
|
dd8d7df89f
|
剧情特效提交
|
2021-04-29 18:55:31 +08:00 |
gaoxin
|
7bae49b1c2
|
【至尊降世】特效修改
|
2021-04-29 17:53:40 +08:00 |
ZhangBiao
|
22df869cd9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:46:40 +08:00 |
ZhangBiao
|
4f2c8ad573
|
【竞技场】回滚提交
|
2021-04-29 17:46:23 +08:00 |
jiaoyangna
|
f86caefd7d
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 17:44:52 +08:00 |
jiaoyangna
|
fb9d2b7272
|
剧情提交
|
2021-04-29 17:44:35 +08:00 |
ZhangBiao
|
f634ae4e4b
|
【竞技场、云游商人】竞技场时间到未弹出,云游增加log
|
2021-04-29 17:42:35 +08:00 |
ZhangBiao
|
2133dc0209
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:23:16 +08:00 |
ZhangBiao
|
441495fcfe
|
【踏碎凌霄】奖励增加序号
|
2021-04-29 17:23:06 +08:00 |
gaoxin
|
4950e48b2f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:12:38 +08:00 |
gaoxin
|
d413915c6a
|
【竞技场】修复竞技场赛季切换时也会显示红点儿的问题
|
2021-04-29 17:12:12 +08:00 |
jiaoyangna
|
aba55c9b7c
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 17:10:13 +08:00 |
gaoxin
|
bfe66493ab
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:03:47 +08:00 |
gaoxin
|
e4fea4a6dd
|
【竞技场】新赛季重置积分,一进来是上赛季的积分,再点进去才是本赛季的积分
|
2021-04-29 17:03:41 +08:00 |
jiaoyangna
|
ed9c058ece
|
修改剧情入口
|
2021-04-29 17:00:12 +08:00 |
ZhangBiao
|
e5a19b76f1
|
【踏碎凌霄】报错修改
|
2021-04-29 16:24:55 +08:00 |
ZhangBiao
|
8645d3f4e5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 16:20:14 +08:00 |
ZhangBiao
|
bc1b55d7f3
|
【踏碎凌霄】增加包厢数量显示
|
2021-04-29 16:19:58 +08:00 |
gaoxin
|
871e4c4257
|
【资源】修复特惠商城资源变形
|
2021-04-29 16:19:15 +08:00 |
gaoxin
|
a4b0ad41b7
|
【资源】玉帝动作替换
|
2021-04-29 16:17:10 +08:00 |
jiaoyangna
|
8c7208dff3
|
删除log
|
2021-04-29 15:57:00 +08:00 |
ZhangBiao
|
79fb3ef29f
|
【踏碎凌霄】“下档奖励”问题修改
|
2021-04-29 15:46:39 +08:00 |
ZhangBiao
|
c8cd8174d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 15:40:19 +08:00 |
ZhangBiao
|
a725565ac6
|
【踏碎凌霄】修改提交
|
2021-04-29 15:40:10 +08:00 |
jiaoyangna
|
bd1f264452
|
剧情提交
|
2021-04-29 15:36:36 +08:00 |
jiaoyangna
|
73b094b9a4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-29 15:35:22 +08:00 |
jiaoyangna
|
1da013efda
|
剧情提交
|
2021-04-29 15:35:18 +08:00 |
gaoxin
|
b6366a970e
|
【首充】云动画每天只播放一次
|
2021-04-29 15:08:34 +08:00 |
zhangqiang
|
f6a600b3fc
|
【月卡时间】时分秒时候刷新延迟一秒
|
2021-04-29 14:56:19 +08:00 |
ZhangBiao
|
6e4b930e84
|
【踏碎凌霄】宝箱修改
|
2021-04-29 14:52:14 +08:00 |
ZhangBiao
|
ecccb455a2
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 14:35:28 +08:00 |
ZhangBiao
|
51fa96bd14
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 14:34:08 +08:00 |
ZhangBiao
|
5da3914599
|
【踏碎凌霄优化】玩法界面上显示下一个目标的血条
|
2021-04-29 14:33:58 +08:00 |
wangzhenxing
|
e88f4d83d7
|
主城左滑箭头添加呼吸动画
|
2021-04-29 14:07:14 +08:00 |
gaoxin
|
07b41217fa
|
【挂机】攻击特效穿透
|
2021-04-29 11:45:39 +08:00 |
jiaoyangna
|
1e9c52b612
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-29 11:37:35 +08:00 |
jiaoyangna
|
80b9cbe3c1
|
关掉跑步音效
|
2021-04-29 11:37:12 +08:00 |
gaoxin
|
2da00831ed
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-29 10:54:27 +08:00 |
gaoxin
|
406b7923a6
|
【资源】充值按钮资源替换
|
2021-04-29 10:54:22 +08:00 |
zhangqiang
|
c202e03703
|
【英雄详情升星】升星后的属性没有加团队属性
|
2021-04-29 10:09:27 +08:00 |
jiaoyangna
|
660299a6d2
|
六星玉帝入口跳转特定礼包修改提交
|
2021-04-29 10:08:28 +08:00 |
gaoxin
|
f570a522fe
|
【挂机】修复偶现生成怪的位置不够的问题
|
2021-04-28 19:02:02 +08:00 |
gaoxin
|
af3bb06c32
|
【资源】首充,至尊降世文字资源替换
|
2021-04-28 16:05:20 +08:00 |
gaoxin
|
fb29ac6187
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-28 05:44:12 +08:00 |
gaoxin
|
262b07d1af
|
【剧情】修复连续播放两个剧情导致重复引导首充的问题
|
2021-04-28 05:43:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
3bde92fa6e
|
【超值基金】月卡判断去掉修改2--- 张强
|
2021-10-31 01:06:49 +07:00 |
DESKTOP-98AVA47\Administrator
|
da44c05e9f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-07-14 01:46:26 +07:00 |
DESKTOP-98AVA47\Administrator
|
d9d1e50e9c
|
【超值基金】去掉月卡激活判断
|
2021-07-14 01:45:47 +07:00 |
ZhangBiao
|
23d3fa42fd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 05:10:31 +08:00 |
ZhangBiao
|
95b4b8197a
|
【特权商城】特效消失修改
|
2021-04-28 05:10:00 +08:00 |
wangzhenxing
|
46857168c1
|
6星玉帝入口消失逻辑添加容错
|
2021-04-28 03:34:53 +08:00 |
wangzhenxing
|
4e61e39e53
|
主城 六星玉帝入口,16日登陆入口适配
|
2021-04-28 02:52:56 +08:00 |
gaoxin
|
db174bd4b9
|
【剧情】修改女性角色的立绘信息为表配置,id写死为5402
|
2021-04-28 02:44:03 +08:00 |
gaoxin
|
37f976e4be
|
【资源】资源缺失提交
|
2021-04-28 02:43:24 +08:00 |
gaoxin
|
11aa6db24c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 02:30:02 +08:00 |
gaoxin
|
cc42912aca
|
【资源】玉皇大帝资源重复修正
|
2021-04-28 02:29:58 +08:00 |
wangzhenxing
|
f936e4f8df
|
Revert "主城左上角入口添加grid组件"
This reverts commit e1fb031c57.
|
2021-04-28 02:25:20 +08:00 |
gaoxin
|
859d88822e
|
【资源】立绘修改
|
2021-04-28 02:08:57 +08:00 |
gaoxin
|
9190b2e966
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-28 02:05:12 +08:00 |
gaoxin
|
d36820dbcc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-28 02:04:54 +08:00 |
gaoxin
|
1cea3471b1
|
【资源】玉皇大帝技能资源添加
|
2021-04-28 02:04:47 +08:00 |
ZhangBiao
|
03babfe313
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 01:51:24 +08:00 |
ZhangBiao
|
a8353cf884
|
【踏碎凌霄】掉落修改
|
2021-04-28 01:51:16 +08:00 |
zhangqiang
|
23e9de7611
|
Revert "【超值基金】购买后显示天数+1特殊处理"
This reverts commit 9f1c678482.
|
2021-04-28 01:41:15 +08:00 |
zhangqiang
|
9f1c678482
|
【超值基金】购买后显示天数+1特殊处理
|
2021-04-28 01:23:42 +08:00 |
zhangqiang
|
dc13bc21cf
|
【超值基金】未购买隐藏礼包的时间
|
2021-04-28 00:58:11 +08:00 |
wangzhenxing
|
e1fb031c57
|
主城左上角入口添加grid组件
|
2021-04-28 00:50:47 +08:00 |
jiaoyangna
|
d55dfb5130
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:43:30 +08:00 |
jiaoyangna
|
cbc49ace13
|
屏蔽跳过按钮
(cherry picked from commit 479931095c)
|
2021-04-28 00:43:18 +08:00 |
jiaoyangna
|
479931095c
|
屏蔽跳过按钮
|
2021-04-28 00:42:42 +08:00 |
wangzhenxing
|
34b49c5aed
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:33:56 +08:00 |
wangzhenxing
|
54601fb463
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:33:07 +08:00 |
wangzhenxing
|
e918945386
|
主城六星玉帝入口进入成长礼包滑动到指定条目
|
2021-04-28 00:32:55 +08:00 |
ZhangBiao
|
874da03cb8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:32:53 +08:00 |
ZhangBiao
|
1cbebc79d4
|
【推送礼包】文字修改
|
2021-04-28 00:32:43 +08:00 |
jiaoyangna
|
5223d8f865
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:25:39 +08:00 |
jiaoyangna
|
e009f94f48
|
删除多余按钮
|
2021-04-28 00:25:27 +08:00 |
gaoxin
|
c70840f7db
|
【踏碎凌霄】boss不再放大
(cherry picked from commit c391b5885e)
|
2021-04-28 00:22:18 +08:00 |
gaoxin
|
c391b5885e
|
【踏碎凌霄】boss不再放大
|
2021-04-28 00:21:31 +08:00 |
jiaoyangna
|
f2684e25d5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:16:18 +08:00 |
jiaoyangna
|
f352c53b6f
|
关闭主城临时剧情入口
|
2021-04-28 00:16:08 +08:00 |
ZhangBiao
|
4f8b0fbefe
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:15:15 +08:00 |
jiaoyangna
|
c04277c304
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:14:55 +08:00 |
jiaoyangna
|
cad4f57850
|
添加天尊降世的剧情动画
|
2021-04-28 00:14:50 +08:00 |
ZhangBiao
|
c1462b55ff
|
【踏碎凌霄】玉皇大帝界面提交
|
2021-04-28 00:14:03 +08:00 |
ZhangBiao
|
34cb4d6f16
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-28 00:08:54 +08:00 |
ZhangBiao
|
e15921969a
|
【限时兑换】修改
|
2021-04-28 00:08:41 +08:00 |
jiaoyangna
|
3f937a4d93
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:57:10 +08:00 |
jiaoyangna
|
b09dca146a
|
称号修改
(cherry picked from commit 5b76245ae0)
|
2021-04-27 23:57:00 +08:00 |
gaoxin
|
5f3ec93c01
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:50:19 +08:00 |
gaoxin
|
668f78d3d2
|
【资源】重复资源名处理
|
2021-04-27 23:50:14 +08:00 |
jiaoyangna
|
3f4bd74db3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:44:10 +08:00 |
jiaoyangna
|
974279f565
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua
|
2021-04-27 23:43:58 +08:00 |
ZhangBiao
|
1308a7bf69
|
【踏碎凌霄】提交
|
2021-04-27 23:43:20 +08:00 |
gaoxin
|
e0b212c61d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:42:25 +08:00 |
gaoxin
|
4ea075e0e5
|
【资源】玉帝资源名修改
|
2021-04-27 23:42:13 +08:00 |
jiaoyangna
|
4326a6b300
|
删除多余的按钮
|
2021-04-27 23:39:40 +08:00 |
ZhangBiao
|
3c9ff8f73d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:37:20 +08:00 |
jiaoyangna
|
07810200cb
|
剧情提交
|
2021-04-27 23:37:16 +08:00 |
ZhangBiao
|
ba024be162
|
【踏碎凌霄】已未达成提交
|
2021-04-27 23:37:11 +08:00 |
gaoxin
|
814e176896
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:28:28 +08:00 |
gaoxin
|
e5d72d3b6b
|
【资源】玉皇大帝资源导入
|
2021-04-27 23:28:21 +08:00 |
zhangqiang
|
6775377060
|
【主城超值基金隐藏倒计时】
|
2021-04-27 23:25:39 +08:00 |