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 |
jiaoyangna
|
8a4ff04f33
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-28 00:34:19 +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
|
382f80b5a0
|
删除多余按钮
(cherry picked from commit e009f94f48 )
|
2021-04-28 00:27:36 +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 |
gaoxin
|
087bc126ad
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-28 00:06:52 +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 |
jiaoyangna
|
5b76245ae0
|
称号修改
|
2021-04-27 23:56:42 +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 |
ZhangBiao
|
a22d0851a0
|
【推送礼包】提示文字修改
|
2021-04-27 23:13:07 +08:00 |
zhangqiang
|
52e6cdd917
|
【累计充值红点】主题活动中累计充值的红点会显示在限时活动入口
|
2021-04-27 23:04:58 +08:00 |
wangzhenxing
|
916b4e2eae
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:56:03 +08:00 |
wangzhenxing
|
4cc296e58f
|
【天尊降世】遗漏资源提交
|
2021-04-27 22:55:45 +08:00 |
ZhangBiao
|
a357ae16d4
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:51:22 +08:00 |
ZhangBiao
|
8910bf6219
|
【踏碎凌霄】战斗血条提交
|
2021-04-27 22:51:07 +08:00 |
wangzhenxing
|
520e5de224
|
天尊降世预设修改
|
2021-04-27 22:48:02 +08:00 |
wangzhenxing
|
c3ee3da9dd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:42:19 +08:00 |
wangzhenxing
|
137196f197
|
天尊降世预设提交
|
2021-04-27 22:41:56 +08:00 |