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 |
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 |
gaoxin
|
bc441f50e3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:40:30 +08:00 |
gaoxin
|
059535bbc0
|
【资源】新增法宝资源,玄黄之气资源替换,玉帝技能文字替换
|
2021-04-27 22:40:20 +08:00 |
wangzhenxing
|
0dc8f94264
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:35:15 +08:00 |
wangzhenxing
|
0a6be18474
|
成长礼包banner替换回之前的
|
2021-04-27 22:34:18 +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 |
jiaoyangna
|
b2cd860042
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:28:59 +08:00 |
jiaoyangna
|
fb90162ae8
|
预设提交
(cherry picked from commit 941d3856a2)
|
2021-04-27 22:28:49 +08:00 |
jiaoyangna
|
941d3856a2
|
预设提交
|
2021-04-27 22:28:30 +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 |
ZhangBiao
|
dfb0a68f2c
|
【踏碎凌霄】资源提交
|
2021-04-27 21:45:04 +08:00 |
ZhangBiao
|
5401776a8d
|
【踏碎凌霄】界面显示调整
|
2021-04-27 21:28:48 +08:00 |
ZhangBiao
|
4e0b5a9033
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 21:17:51 +08:00 |
ZhangBiao
|
8e72485e7b
|
【累计充值】资源替换
|
2021-04-27 21:17:42 +08:00 |
zhangqiang
|
85136a4cc9
|
【逍遥游】奖励预览,跳转出去,再返回,奖池不显示道具
|
2021-04-27 21:17:35 +08:00 |
zhangqiang
|
8db10cf7eb
|
【神衣天降】购买次数显示修改
|
2021-04-27 21:09:29 +08:00 |
gaoxin
|
2be2ba92dd
|
【七天狂欢】偶现报错
|
2021-04-27 20:56:09 +08:00 |
gaoxin
|
9b4ce2d96a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 20:53:42 +08:00 |
gaoxin
|
3616fba4fb
|
【副本banner】还原
|
2021-04-27 20:53:32 +08:00 |
zhangqiang
|
a46c7f3413
|
【恭喜获得修改】
|
2021-04-27 20:48:45 +08:00 |
jiaoyangna
|
b52e90c96a
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-27 20:46:12 +08:00 |
jiaoyangna
|
dd90a200c3
|
剧情提交
|
2021-04-27 20:45:03 +08:00 |
gaoxin
|
3640a17c22
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 20:44:56 +08:00 |
gaoxin
|
6d38527065
|
【云游商人】排序错误
|
2021-04-27 20:44:45 +08:00 |
ZhangBiao
|
407750afd5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 20:35:37 +08:00 |
ZhangBiao
|
833473f334
|
【踏碎凌霄】恭喜获得无奖励提示
|
2021-04-27 20:35:27 +08:00 |
gaoxin
|
923034957e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 20:26:15 +08:00 |
gaoxin
|
1e7142008c
|
【云游商人】选中武器点确定,再选中护甲点取消,最后合成的是护甲
|
2021-04-27 20:26:10 +08:00 |
jiaoyangna
|
fd9084da86
|
关掉挂机打怪的声音
|
2021-04-27 20:18:26 +08:00 |
ZhangBiao
|
b695224100
|
【商店刷新】商店刷新时间错误
|
2021-04-27 20:18:18 +08:00 |
ZhangBiao
|
a69e92bc75
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 20:03:48 +08:00 |
ZhangBiao
|
c24e7504cb
|
【恭喜获得】点击面板也可关闭
|
2021-04-27 20:03:37 +08:00 |
jiaoyangna
|
ccaab65e25
|
剧情提交
|
2021-04-27 19:51:40 +08:00 |
gaoxin
|
a5b8dc1de9
|
【Log】删除一个停不下来的Log
|
2021-04-27 18:16:46 +08:00 |
gaoxin
|
8be0dd71f0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 18:02:56 +08:00 |
gaoxin
|
68626e287e
|
【踏碎凌霄】奖励排序
|
2021-04-27 18:02:51 +08:00 |
zhangqiang
|
f20c58dc96
|
【公会援助】 每次点击援助,列表都会重新置顶显示----3
|
2021-04-27 17:56:55 +08:00 |
zhangqiang
|
4cbb65c73b
|
【超值基金】买两次 尝试修复
|
2021-04-27 17:53:15 +08:00 |
ZhangBiao
|
90fd541e99
|
【限时活动】删除timer
|
2021-04-27 17:50:26 +08:00 |
ZhangBiao
|
39f2f06563
|
【限时活动】调整
|
2021-04-27 17:05:53 +08:00 |
wangzhenxing
|
5937fc3493
|
等级推送礼包预设修改
|
2021-04-27 16:51:58 +08:00 |
ZhangBiao
|
c88bda25c7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 16:46:50 +08:00 |
ZhangBiao
|
6f17dbd874
|
【恭喜获得】报错
|
2021-04-27 16:46:39 +08:00 |
gaoxin
|
b9f742fcf2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 16:46:13 +08:00 |
gaoxin
|
3775b6ae86
|
【网络】消息id打印位置修改
|
2021-04-27 16:46:02 +08:00 |
ZhangBiao
|
6b26846677
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 16:37:17 +08:00 |
ZhangBiao
|
87b94c283a
|
【恭喜获得】奖励叠加
|
2021-04-27 16:37:03 +08:00 |
wangzhenxing
|
2d87367728
|
副本入口图片位置修改提交
|
2021-04-27 16:31:32 +08:00 |
gaoxin
|
2a107e99cb
|
【红点】关闭一些重复注册的红点
|
2021-04-27 16:30:08 +08:00 |
gaoxin
|
dc12373d06
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 16:25:19 +08:00 |
gaoxin
|
67ddcedfa2
|
【网络】socket 报错
|
2021-04-27 16:25:09 +08:00 |
zhangqiang
|
9f69ba9d7c
|
【新的协议】
|
2021-04-27 16:23:25 +08:00 |
jiaoyangna
|
f658dcaf66
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 16:19:31 +08:00 |
jiaoyangna
|
5b9b72fea5
|
资源提交
(cherry picked from commit 059c9940cc)
|
2021-04-27 16:19:20 +08:00 |
gaoxin
|
ef856fd534
|
【网络】当后端推送未注册的indication时,进行错误提示
|
2021-04-27 16:17:58 +08:00 |
jiaoyangna
|
059c9940cc
|
资源提交
|
2021-04-27 16:16:41 +08:00 |
gaoxin
|
87f3f6da6c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 16:00:34 +08:00 |
gaoxin
|
fe6a38cbad
|
【轩辕宝境】进入界面时,当前不开放的宝境入口也会亮起1S左右
|
2021-04-27 16:00:24 +08:00 |
wangzhenxing
|
06e61b64e8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 15:50:59 +08:00 |
wangzhenxing
|
f088d4d81b
|
预设修改 boss怒气添加特效
|
2021-04-27 15:50:23 +08:00 |
gaoxin
|
16268410b7
|
【拍脸】部分界面销毁后导致报错
|
2021-04-27 15:49:56 +08:00 |
gaoxin
|
b1e3b753e4
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 15:45:53 +08:00 |
gaoxin
|
7cbec8230a
|
【跳转】跳转充值,点返回没反应,再点直接返回主城
|
2021-04-27 15:45:49 +08:00 |
ZhangBiao
|
eb81667c29
|
【碎片合成】
|
2021-04-27 15:28:18 +08:00 |
ZhangBiao
|
3512d1da7e
|
【开服累计充值】没有倒计时
|
2021-04-27 15:16:21 +08:00 |
gaoxin
|
d610d44c0f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 14:42:23 +08:00 |
gaoxin
|
5254edb78f
|
【UI配置】多余删除还原
|
2021-04-27 14:42:13 +08:00 |
ZhangBiao
|
b18596b8b0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 14:34:59 +08:00 |
ZhangBiao
|
d1a1d922c1
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-04-27 14:34:52 +08:00 |
zhangqiang
|
b000e84564
|
【超值基金】判断是否可购买 修改 2
|
2021-04-27 14:34:29 +08:00 |