Commit Graph

3598 Commits (b52e90c96a136745be1b3370668bc423aecd3ff6)

Author SHA1 Message Date
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
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
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
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