Commit Graph

3828 Commits (52e6cdd917070d7812c0b59ffd272904d3f7a413)

Author SHA1 Message Date
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
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
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
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
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
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
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
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
zhangqiang bf895d04d1 【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来 2021-04-21 17:49:58 +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
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