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
|
bc1b55d7f3
|
【踏碎凌霄】增加包厢数量显示
|
2021-04-29 16:19:58 +08:00 |
jiaoyangna
|
8c7208dff3
|
删除log
|
2021-04-29 15:57:00 +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
|
ecccb455a2
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 14:35:28 +08:00 |
ZhangBiao
|
5da3914599
|
【踏碎凌霄优化】玩法界面上显示下一个目标的血条
|
2021-04-29 14:33:58 +08:00 |
jiaoyangna
|
80b9cbe3c1
|
关掉跑步音效
|
2021-04-29 11:37:12 +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
|
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 |
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 |
ZhangBiao
|
dfb0a68f2c
|
【踏碎凌霄】资源提交
|
2021-04-27 21:45:04 +08:00 |
ZhangBiao
|
5401776a8d
|
【踏碎凌霄】界面显示调整
|
2021-04-27 21:28:48 +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 |
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
|
6d38527065
|
【云游商人】排序错误
|
2021-04-27 20:44:45 +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 |
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 |
ZhangBiao
|
6f17dbd874
|
【恭喜获得】报错
|
2021-04-27 16:46:39 +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 |
zhangqiang
|
9f69ba9d7c
|
【新的协议】
|
2021-04-27 16:23:25 +08:00 |
gaoxin
|
fe6a38cbad
|
【轩辕宝境】进入界面时,当前不开放的宝境入口也会亮起1S左右
|
2021-04-27 16:00:24 +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 |
ZhangBiao
|
df76a49401
|
【碎片自选箱】通过道具详情跳转别的地方,返回后选中标识居中
|
2021-04-27 14:33:25 +08:00 |
gaoxin
|
555d046748
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-27 14:16:46 +08:00 |
ZhangBiao
|
eb7d89578a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 13:48:29 +08:00 |
ZhangBiao
|
74b2ef62ca
|
【恭喜获得】提交
|
2021-04-27 13:48:17 +08:00 |
gaoxin
|
533885679c
|
【踏碎凌霄】boss放大添加
|
2021-04-27 13:32:41 +08:00 |
gaoxin
|
854c11affc
|
Merge remote-tracking branch 'origin/china/dev-c' into china/dev
|
2021-04-26 20:49:43 +08:00 |
ZhangBiao
|
cf1cf818e2
|
【战斗界面】上方血条移仓
|
2021-04-26 20:45:42 +08:00 |
ZhangBiao
|
171da338df
|
Revert "【战斗界面】上方血条问题修改"
This reverts commit 46d492529f.
|
2021-04-26 20:44:08 +08:00 |
ZhangBiao
|
91a569d918
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-26 20:42:58 +08:00 |
ZhangBiao
|
46d492529f
|
【战斗界面】上方血条问题修改
|
2021-04-26 20:42:49 +08:00 |
zhangqiang
|
3d1857dfcd
|
【前端拍脸修改】提交——2
|
2021-04-26 20:35:54 +08:00 |
zhangqiang
|
460ec366cb
|
【礼包】去掉LevelLinit 字段判断
|
2021-04-26 20:27:29 +08:00 |
zhangqiang
|
ca9594fefc
|
【超值基金】是否可购买判断修改
|
2021-04-26 20:08:32 +08:00 |
gaoxin
|
357a27c100
|
Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
# Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-04-26 19:03:05 +08:00 |
jiaoyangna
|
8b8d0a3956
|
剧情 提交
|
2021-04-26 18:57:54 +08:00 |
ZhangBiao
|
24937470ad
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-26 18:46:27 +08:00 |
ZhangBiao
|
90fbe78773
|
【积天豪礼】提交
|
2021-04-26 18:46:19 +08:00 |
jiaoyangna
|
637aa36041
|
剧情提交
|
2021-04-26 18:29:47 +08:00 |
gaoxin
|
7df1514da8
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
|
2021-04-26 17:55:43 +08:00 |
ZhangBiao
|
2770e6da31
|
Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-04-26 17:18:02 +08:00 |
ZhangBiao
|
73588be932
|
【踏碎凌霄】
|
2021-04-26 17:12:39 +08:00 |
ZhangBiao
|
8269afe74d
|
【踏碎凌霄】回访
|
2021-04-26 16:53:36 +08:00 |
ZhangBiao
|
98f12190ea
|
【踏碎凌霄】
|
2021-04-26 16:46:03 +08:00 |
ZhangBiao
|
31b9eb3057
|
【踏碎凌霄】
|
2021-04-26 16:20:22 +08:00 |
wangzhenxing
|
62112ecff0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-26 15:45:43 +08:00 |
wangzhenxing
|
ebde6e43b0
|
[功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能
|
2021-04-26 15:45:30 +08:00 |
zhangqiang
|
154e048796
|
【十五日登陆】无可领取奖励时,入口消失
|
2021-04-26 15:19:11 +08:00 |
zhangqiang
|
b4ed183fc6
|
【前端拍脸修改】提交——1
|
2021-04-26 13:44:31 +08:00 |
zhangqiang
|
26e63d7c9e
|
【月卡】累冲金额调整
|
2021-04-26 12:11:02 +08:00 |
jiaoyangna
|
f38e838967
|
特权商城跳转到对应礼包位置
|
2021-04-26 10:38:57 +08:00 |
ZhangBiao
|
b0d0fab6d5
|
【踏碎凌霄】提交
|
2021-04-26 10:23:19 +08:00 |
wangzhenxing
|
7a5d44a8f2
|
【战斗】============被动313修改
|
2021-04-26 10:00:11 +08:00 |
jiaoyangna
|
15ef116032
|
剧情提交
|
2021-04-26 09:41:41 +08:00 |
gaoxin
|
e25750d948
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-25 21:30:31 +08:00 |
gaoxin
|
2a4b70f212
|
【回放】修复战斗回放时报错
|
2021-04-25 21:30:25 +08:00 |
wangzhenxing
|
324c93e93f
|
【战斗】==============被动313修改
|
2021-04-25 19:50:54 +08:00 |
gaoxin
|
9874f5b42a
|
【新人商城】法宝直升25级提示添加
|
2021-04-25 19:26:58 +08:00 |
ZhangBiao
|
072b7713c2
|
【恭喜获得】界面结构调整
|
2021-04-25 17:40:49 +08:00 |
gaoxin
|
f9df42a165
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-25 17:01:43 +08:00 |
gaoxin
|
0adf5574ed
|
【活动】快速切换页签时会出现报错
|
2021-04-25 17:01:32 +08:00 |
zhangqiang
|
fbd3bc91ee
|
【公会援助】每次点击援助,列表都会重新置顶显示——2
|
2021-04-25 16:54:03 +08:00 |
gaoxin
|
23e5b50dc4
|
【活动】修复极速达人打开界面报错
|
2021-04-25 16:52:11 +08:00 |
gaoxin
|
ae913805c5
|
【挂机】界面关闭后,携程中添加空判断防止报错
|
2021-04-25 16:49:39 +08:00 |
gaoxin
|
229b7165ee
|
【挂机】第五账地图偶现死循环卡死
|
2021-04-25 16:49:08 +08:00 |
gaoxin
|
d48b6fc988
|
【对象池】偶现回收出现空物体,导致报错的问题
|
2021-04-25 16:48:41 +08:00 |
gaoxin
|
77955d6f9c
|
【挂机】修复金钱流光在宝箱上不消失
|
2021-04-25 16:11:00 +08:00 |
gaoxin
|
1c69c62ab7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-25 16:05:16 +08:00 |
gaoxin
|
4a33407d27
|
【挂机】修复部分章节卡死
|
2021-04-25 16:05:11 +08:00 |
wangzhenxing
|
efa66c0130
|
【战斗】=========被动313 修改
|
2021-04-25 15:53:24 +08:00 |
wangzhenxing
|
26d50be57c
|
【战斗】================增加313被动
|
2021-04-25 15:46:08 +08:00 |
zhangqiang
|
959a40bca9
|
【头像】初始头像消失
|
2021-04-25 15:27:44 +08:00 |
ZhangBiao
|
39329ce5cc
|
【踏碎凌霄提交】
|
2021-04-25 15:07:36 +08:00 |
zhangqiang
|
b113f5c221
|
【送神祠】放生灵兽,选择单只灵兽,碎片会出现黑色图片
|
2021-04-25 14:57:45 +08:00 |
wangzhenxing
|
63caca8a31
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-25 14:27:00 +08:00 |
wangzhenxing
|
8bece9b87b
|
副本入口立绘位置修改
|
2021-04-25 14:25:40 +08:00 |
zhangqiang
|
2b595bb8f5
|
【跳转】化虚坛跳转修改2
|
2021-04-25 14:20:07 +08:00 |
zhangqiang
|
438bfea81a
|
【跳转】修改化虚坛跳转
|
2021-04-25 14:02:27 +08:00 |
gaoxin
|
89f201d8f9
|
【引导战斗】添加跳过功能
|
2021-04-25 11:41:15 +08:00 |
gaoxin
|
379de4fed0
|
【活动】每日礼包不再在界面中刷新数据,会导致死循环
|
2021-04-25 11:14:14 +08:00 |
ZhangBiao
|
6a0a230eb6
|
【踏碎凌霄】
|
2021-04-23 19:37:15 +08:00 |
ZhangBiao
|
1f9c73e6ed
|
【踏碎凌霄】
|
2021-04-23 17:59:56 +08:00 |
ZhangBiao
|
325421e04c
|
【踏碎凌霄】提交
|
2021-04-23 17:56:57 +08:00 |
ZhangBiao
|
03a19bdd14
|
【森罗无尽】没有小人修复
|
2021-04-23 16:19:44 +08:00 |
ZhangBiao
|
b3f3336fdc
|
【踏碎凌霄】提交
|
2021-04-23 16:18:56 +08:00 |
ZhangBiao
|
c2e97f144d
|
【森罗无尽】小人消失i修改
|
2021-04-23 16:04:28 +08:00 |
ZhangBiao
|
a9c21bc78a
|
【踏碎凌霄】
|
2021-04-23 15:39:46 +08:00 |
wangzhenxing
|
898edb53be
|
[功能]==========聊天称号特效显示修改
|
2021-04-23 14:46:37 +08:00 |
ZhangBiao
|
bd236f0f32
|
【踏碎凌霄】
|
2021-04-23 14:12:24 +08:00 |
gaoxin
|
4aa65ff804
|
【关闭log】
|
2021-04-23 14:08:27 +08:00 |
gaoxin
|
3e3f5888d0
|
【白片】添加一些debug日志
|
2021-04-23 11:42:27 +08:00 |
gaoxin
|
05fbc4ba64
|
【白片修复】尝试修复白片问题
|
2021-04-23 10:38:23 +08:00 |
ZhangBiao
|
2df671ce67
|
【云游商人】装备穿戴卸下 道具消失报错
|
2021-04-23 10:19:38 +08:00 |
gaoxin
|
692e912596
|
【ios推荐】寻宝报错,白片修复
|
2021-04-23 10:01:42 +08:00 |
gaoxin
|
f1c10a99e9
|
【ios推荐】白片处理
|
2021-04-22 21:34:11 +08:00 |
gaoxin
|
fa61ea1317
|
【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏
|
2021-04-22 20:39:30 +08:00 |
gaoxin
|
59577999a5
|
Revert "【内存优化】添加一些debug打印"
This reverts commit 31ad3358bc.
|
2021-04-22 18:27:29 +08:00 |
gaoxin
|
868643f87c
|
【spLoader】处理一些白片问题
|
2021-04-22 18:26:48 +08:00 |
jiaoyangna
|
42b91c0a4e
|
剧情提交
|
2021-04-22 18:13:28 +08:00 |
ZhangBiao
|
75be84bbff
|
【云游商人】怎加妖晶数量检测
|
2021-04-22 18:12:16 +08:00 |
ZhangBiao
|
99602b3008
|
【云游商人】问号,红点修改
|
2021-04-22 18:00:53 +08:00 |
gaoxin
|
d9640a660c
|
【sploader】翻译资源加载优化
|
2021-04-22 17:54:03 +08:00 |
ZhangBiao
|
9ba655847b
|
Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
|
2021-04-22 17:23:31 +08:00 |
ZhangBiao
|
de6ac55599
|
【踏碎凌霄】
|
2021-04-22 17:22:49 +08:00 |
zhangqiang
|
d373b1ff0f
|
【累积充值】金额斜了
|
2021-04-22 16:54:20 +08:00 |
gaoxin
|
12856c1287
|
【ui】修复跳转后导致tip报错
|
2021-04-22 16:50:45 +08:00 |
ZhangBiao
|
045b0d80b3
|
【限时活动】奖励顺序调整
|
2021-04-22 15:53:47 +08:00 |
ZhangBiao
|
b6350ad492
|
【踏碎凌霄】
|
2021-04-22 15:40:21 +08:00 |
zhangqiang
|
2b122d7fee
|
【公会援助】每次点击援助,列表都会重新置顶显示
|
2021-04-22 15:31:03 +08:00 |
gaoxin
|
80a2b1a1f3
|
【跳转】跳转到大页签时强制关闭所有界面,副本界面关闭mask
|
2021-04-22 15:24:46 +08:00 |
jiaoyangna
|
a8393f2fb1
|
Merge branch 'china/dev-c' into 剧情
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-04-22 15:09:00 +08:00 |
jiaoyangna
|
a0ecd56968
|
剧情提交
|
2021-04-22 15:06:47 +08:00 |
gaoxin
|
fa533f28df
|
【spLoader】延时2秒再卸载
|
2021-04-22 14:37:16 +08:00 |
jiaoyangna
|
3b59ae09ec
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-22 13:59:37 +08:00 |
jiaoyangna
|
a5d90a6000
|
挂机界面报错修改
|
2021-04-22 13:59:33 +08:00 |
gaoxin
|
43afe3d6f1
|
【内存】btview可能会导致重复卸载资源的问题
|
2021-04-22 13:40:04 +08:00 |
gaoxin
|
7bfc88070b
|
【内存】界面销毁时,不再主动卸载无用资源
|
2021-04-22 11:29:55 +08:00 |
gaoxin
|
39afab6123
|
【内存优化】添加一些log
|
2021-04-22 11:20:16 +08:00 |
ZhangBiao
|
eb9d3ed21c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-22 10:59:53 +08:00 |
ZhangBiao
|
8117c5ebba
|
【云游商人】怎加红点
|
2021-04-22 10:59:32 +08:00 |
zhangqiang
|
f89fb7fc70
|
【限时召唤】限时召唤十连结果的顶部货币栏,不应显示普通召唤的货币,改为显示寻仙玉和妖晶——2
|
2021-04-22 10:32:45 +08:00 |
zhangqiang
|
720e9a2d75
|
【日常副本】“今日剩余次数”修改为“今日剩余免费次数”——3
|
2021-04-22 10:20:42 +08:00 |
gaoxin
|
31ad3358bc
|
【内存优化】添加一些debug打印
|
2021-04-22 09:46:59 +08:00 |
gaoxin
|
e277760221
|
【内存优化】修复资源卸载时会错误卸载其他界面的问题
|
2021-04-21 22:45:37 +08:00 |
zhangqiang
|
18984a9885
|
【邮件】已领取的附件图标上对应标志消失
|
2021-04-21 21:03:13 +08:00 |
ZhangBiao
|
35c89e734d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-21 20:24:23 +08:00 |
ZhangBiao
|
8e76fc3e5d
|
【云游商人】提交
|
2021-04-21 20:24:06 +08:00 |
zhangqiang
|
e1cfc900b1
|
【送神祠跳转】仙缘余晨跳转送神祠,前往的是分解宝物页签
|
2021-04-21 20:09:58 +08:00 |
zhangqiang
|
6e5bec75bf
|
【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来——2
|
2021-04-21 19:53:13 +08:00 |
gaoxin
|
dd667ae26a
|
【ios】sdk登录成功之前不再关闭登录按钮,逍遥游按钮报错
|
2021-04-21 19:28:35 +08:00 |
gaoxin
|
a6dadba241
|
【内存优化】挂机地图不再回收资源,修改未加入公会时点击公会按钮界面错误的问题
|
2021-04-21 18:23:00 +08:00 |
zhangqiang
|
9d773c0532
|
【日常副本优化】首次挑战副本不再消耗次数 —— 2
|
2021-04-21 18:14:28 +08:00 |
ZhangBiao
|
146929c099
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-21 18:06:43 +08:00 |
ZhangBiao
|
5eca5dd50e
|
【珍奇宝阁】双倍修改
(cherry picked from commit 0d4bacbe8297a34561275fe0c5720ff38e349769)
|
2021-04-21 18:06:35 +08:00 |
gaoxin
|
3819869e27
|
Merge branch 'china/dev' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
|
2021-04-21 17:54:16 +08:00 |
zhangqiang
|
bf895d04d1
|
【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来
|
2021-04-21 17:49:58 +08:00 |
gaoxin
|
4ac1c8ce76
|
【内存优化】幸运转盘报错
|
2021-04-21 17:31:44 +08:00 |
ZhangBiao
|
f1538a4776
|
【限时活动】提交
|
2021-04-21 16:49:34 +08:00 |
ZhangBiao
|
6d08ce59a6
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
|
2021-04-21 16:36:35 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
zhangqiang
|
cf3758d19b
|
【三界降魔】活动结束后的提示文字优化
|
2021-04-21 15:47:21 +08:00 |
gaoxin
|
2a6f81e8cf
|
【ios】spLoader产生bug修复
|
2021-04-21 15:09:03 +08:00 |
ZhangBiao
|
eab420381c
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-21 15:02:04 +08:00 |
ZhangBiao
|
aa834ad136
|
【限时活动】重构完成
|
2021-04-21 15:00:20 +08:00 |
wangzhenxing
|
8e24eea290
|
称号bug修改
|
2021-04-21 14:42:06 +08:00 |
zhangqiang
|
78220a5cf9
|
【珍奇宝阁】修改
|
2021-04-21 14:32:43 +08:00 |
jiaoyangna
|
993d891c2b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-21 14:31:32 +08:00 |
jiaoyangna
|
70b4ebdf83
|
容错修改
|
2021-04-21 14:31:26 +08:00 |
zhangqiang
|
048f1bafb9
|
【进度条优化】当进度条上限为1时,将进度条所在位置显示在最右侧
|
2021-04-21 14:30:15 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
zhangqiang
|
f4ca18ff74
|
【日常副本优化】首次挑战副本不再消耗次数
|
2021-04-21 11:45:55 +08:00 |
ZhangBiao
|
30361f5393
|
【限时活动】调整提交
|
2021-04-21 11:37:55 +08:00 |
wangzhenxing
|
eff7ceb60c
|
【ID1008821】
【主界面优化】当右侧未显示区域入口按钮有红点提示时,主界面闪烁显示向右的箭头
|
2021-04-21 10:50:18 +08:00 |
ZhangBiao
|
5043002676
|
【限时活动】限时兑换
|
2021-04-20 21:15:38 +08:00 |
zhangqiang
|
991fb61f57
|
【英雄升星祭品】提交——6
|
2021-04-20 20:59:43 +08:00 |
ZhangBiao
|
a7bd34cdad
|
【限时活动】结构调整
|
2021-04-20 20:32:36 +08:00 |
zhangqiang
|
a7dc372bb7
|
【英雄升星祭品】提交——5
|
2021-04-20 19:58:07 +08:00 |
jiaoyangna
|
61833b8b00
|
Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2021-04-20 17:51:14 +08:00 |
jiaoyangna
|
20cf3f88a9
|
挂机修改提交
|
2021-04-20 17:42:53 +08:00 |
ZhangBiao
|
d1bbe68ebf
|
【限时活动】增加日限时累充
|
2021-04-20 17:41:48 +08:00 |
jiaoyangna
|
9b9d3cb1e9
|
礼包死循环修改提交
|
2021-04-20 17:39:02 +08:00 |
jiaoyangna
|
c7f4c57585
|
点数修改
|
2021-04-20 17:21:32 +08:00 |
jiaoyangna
|
86bc16f904
|
名字添加
|
2021-04-20 17:14:25 +08:00 |
JLIOSM1
|
56d849c6a1
|
【ios】添加图片回收机制,子物体不再从缓存池中创建,修改commonatlas到dy文件夹
|
2021-04-20 17:13:10 +08:00 |
ZhangBiao
|
2051a59d74
|
【达人活动】结构调整
|
2021-04-20 16:43:16 +08:00 |
jiaoyangna
|
45b9c8d81b
|
名字提交
|
2021-04-20 16:42:59 +08:00 |
jiaoyangna
|
8590617839
|
名字提交
|
2021-04-20 16:31:41 +08:00 |
jiaoyangna
|
089f0ce436
|
挂机提交
|
2021-04-20 16:09:56 +08:00 |
jiaoyangna
|
5b2ddbf8e6
|
点数调整
|
2021-04-20 15:10:41 +08:00 |
jiaoyangna
|
1e04dcc200
|
名字提交
|
2021-04-20 14:52:02 +08:00 |
jiaoyangna
|
9cf2502a10
|
删除log
|
2021-04-20 14:00:53 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
zhangqiang
|
aae0749f1a
|
【英雄升星祭品】提交 ——4
|
2021-04-20 13:48:55 +08:00 |
zhangqiang
|
d7a74e8256
|
【归元优化】确认归元弹窗的神将头像改为固定显示在左侧第一位
|
2021-04-20 11:43:24 +08:00 |
zhangqiang
|
189e0f6062
|
【魂印优化】魂印界面的神将头像框颜色,改为当前神将实际星级对应的颜色
|
2021-04-20 11:24:19 +08:00 |
zhangqiang
|
7aefe7f4db
|
【日常副本】“今日剩余次数”修改为“今日剩余免费次数”
|
2021-04-20 11:19:17 +08:00 |
ZhangBiao
|
b2df6d1282
|
【云游商人】
|
2021-04-20 11:17:50 +08:00 |
zhangqiang
|
a4727e6de7
|
【升星优化】选择祭品神将页面,按照神将图鉴排序的反向规则进行排列,使珍贵的神将排序更为靠后,本体仍放在最后的位置
|
2021-04-20 11:13:03 +08:00 |
zhangqiang
|
bee0fa412e
|
【神将合成】化虚坛和选择祭品界面添加长按头像功能 2
|
2021-04-20 10:38:28 +08:00 |
zhangqiang
|
3f903cf911
|
【神将合成】化虚坛和选择祭品界面添加长按头像功能
|
2021-04-20 10:17:57 +08:00 |
zhangqiang
|
20e064b178
|
英雄左右快速切换 ui 重叠
|
2021-04-19 21:29:17 +08:00 |
jiaoyangna
|
c790d3ba8b
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-19 21:26:14 +08:00 |
JLIOSM1
|
257611c4a7
|
【UI】减少UI销毁的等待时间,及时释放内存
|
2021-04-19 21:21:30 +08:00 |
zhangqiang
|
1e688ab350
|
超值基金提交
|
2021-04-19 20:43:15 +08:00 |
zhangqiang
|
d7913e5eab
|
超值基金,限时折扣,点击没反应修改
|
2021-04-19 20:42:11 +08:00 |
ZhangBiao
|
37003eea1b
|
【限时神装】更换背景图
|
2021-04-19 20:28:06 +08:00 |
ZhangBiao
|
24a8cbe9b0
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-19 20:12:51 +08:00 |
ZhangBiao
|
b9acaaa12c
|
【云游商人】完成
|
2021-04-19 19:44:54 +08:00 |
zhangqiang
|
3fb2bae218
|
英雄左右快速切换 ui 重叠
|
2021-04-19 19:36:43 +08:00 |
jiaoyangna
|
f3fa2c9a99
|
挂机界面提交
|
2021-04-19 18:20:57 +08:00 |
zhangqiang
|
4bb6004ace
|
【英雄升星祭品】提交——3
|
2021-04-19 18:05:15 +08:00 |
gaoxin
|
fbe886fc85
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-19 16:15:12 +08:00 |
zhangqiang
|
1942875c2e
|
【图鉴重叠】
|
2021-04-19 16:14:51 +08:00 |
gaoxin
|
d6cad28914
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-19 16:14:18 +08:00 |
wangzhenxing
|
bf6d29d677
|
【ID1008678】
【战斗统计优化】战斗统计中关卡敌人显示具体的星级和品质边框
|
2021-04-19 16:08:15 +08:00 |
ZhangBiao
|
bb5268793e
|
【云游商人】提交
|
2021-04-19 15:43:25 +08:00 |
zhangqiang
|
46efdd02de
|
【英雄升星祭品】提交——02
|
2021-04-19 15:11:39 +08:00 |
zhangqiang
|
9706cd776d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-19 13:46:34 +08:00 |
zhangqiang
|
de76c697c4
|
【英雄升星祭品】提交——01
|
2021-04-19 13:46:24 +08:00 |
jiaoyangna
|
d101c5ce7b
|
名字修改提交
|
2021-04-19 13:02:37 +08:00 |
jiaoyangna
|
efe1bdeab0
|
挂机界面修改
|
2021-04-19 11:58:22 +08:00 |
ZhangBiao
|
3005d9bf30
|
【云游商人】提交
|
2021-04-19 11:38:35 +08:00 |