Commit Graph

3654 Commits (5da3914599469101413106cdabc70c1d5d4e0286)

Author SHA1 Message Date
ZhangBiao 5da3914599 【踏碎凌霄优化】玩法界面上显示下一个目标的血条 2021-04-29 14:33:58 +08:00
zhangqiang c202e03703 【英雄详情升星】升星后的属性没有加团队属性 2021-04-29 10:09:27 +08: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
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
wangzhenxing 4e61e39e53 主城 六星玉帝入口,16日登陆入口适配 2021-04-28 02:52:56 +08:00
gaoxin db174bd4b9 【剧情】修改女性角色的立绘信息为表配置,id写死为5402 2021-04-28 02:44:03 +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
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
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
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 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
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
zhangqiang 6775377060 【主城超值基金隐藏倒计时】 2021-04-27 23:25:39 +08:00
ZhangBiao a22d0851a0 【推送礼包】提示文字修改 2021-04-27 23:13:07 +08:00
zhangqiang 52e6cdd917 【累计充值红点】主题活动中累计充值的红点会显示在限时活动入口 2021-04-27 23:04:58 +08:00
gaoxin 79b73da602 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:31:35 +08:00
gaoxin fb2139ffef 【踏碎凌霄】战斗中掉落的宝箱特效,会在结算界面穿透 2021-04-27 22:30:17 +08:00
ZhangBiao dc03b46855 【踏碎凌霄】活动界面提交 2021-04-27 22:26:36 +08:00
jiaoyangna 88f9e83e1c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:25:16 +08:00
jiaoyangna 58e6a0a554 剧情提交
(cherry picked from commit f43cd38a73)
2021-04-27 22:21:46 +08:00
jiaoyangna f43cd38a73 剧情提交 2021-04-27 22:21:14 +08:00
wangzhenxing d2a7fdcee1 天尊降世活动资源提交 2021-04-27 22:16:42 +08:00