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 |
ZhangBiao
|
2df671ce67
|
【云游商人】装备穿戴卸下 道具消失报错
|
2021-04-23 10:19:38 +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 |