Commit Graph

4381 Commits (f70ffde7d1cd57258415933bb79e624a0866e70d)
 

Author SHA1 Message Date
ZhangBiao 9e7f7454e8 【降妖夺宝】合并分支资源名修改 2020-12-23 11:15:54 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
ZhangBiao f7f0d4099f 【降妖夺宝】结束 2020-12-23 10:34:47 +08:00
guowei fcb2e4604a 【优化】提交 2020-12-23 10:10:48 +08:00
zhangqiang fbf9ce6ba8 【跨服天梯】bug提交 2020-12-22 21:04:16 +08:00
zhangqiang fff1a9934a 【跨服天梯】红点修改提交 2020-12-22 16:15:20 +08:00
zhangqiang 782af971de 【跨服天梯】提交 2020-12-22 15:39:32 +08:00
ZhangBiao 6d5a9f9f42 【社稷大典】公会检查跳转失败修复 2020-12-22 14:20:04 +08:00
wangzhenxing 607104b4ca [战斗]白骨精技能,被动,魂印效果提交 2020-12-22 11:59:26 +09:00
Fuhaifeng 400f799f7e Review of SocletClient... 2020-12-22 10:30:56 +08:00
ZhangBiao f97901cbe0 【增加跳转】增加跳转id 2020-12-22 10:14:54 +08:00
gaoxin 88ba4edad9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-21 19:30:39 +08:00
gaoxin d910facacf 【装备】装备出售界面文字显示修改 2020-12-21 19:30:19 +08:00
zhangqiang f4ea0eddfc 【跨服天梯】修改 2020-12-21 19:26:55 +08:00
zhangqiang c49f65998f 【跨服天梯】修改 2020-12-21 19:25:53 +08:00
gaoxin a0f059ca9b 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:58 +08:00
DESKTOP-98AVA47\Administrator b11cf4dfe3 【巅峰赛】拍脸修改 有表 张强提交 2020-12-24 21:04:33 +08:00
gaoxin cd3548164a 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:43 +08:00
DESKTOP-98AVA47\Administrator c9d8df2c74 【巅峰赛】拍脸修改 有表 张强提交 2020-12-24 21:02:20 +08:00
gaoxin f26796653d 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:03 +08:00
Fuhaifeng eebdb46bdb Reconnect-->Check 2020-12-21 17:44:11 +08:00
Fuhaifeng 0b72d3a042 SocketClient .OnReconnect Bug.fix 2020-12-21 17:34:55 +08:00
ZhangBiao 8d245aab44 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
gaoxin 93f1fe8655 【优化】橙色改为金色 2020-12-21 16:31:40 +08:00
gaoxin 03e3d77bb6 【优化】橙色改为金色 2020-12-21 16:15:17 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
ZhangBiao 3262a6203c 【社稷大典】连续捐献-1修复
(cherry picked from commit 1d5551eee7)
2020-12-21 14:19:41 +08:00
Fuhaifeng 119a64143a no message 2020-12-21 14:18:18 +08:00
Fuhaifeng 6305f796ff no message 2020-12-21 11:37:28 +08:00
Fuhaifeng fa850db689 Merge branch 'master_develop' into Dev_Fuhaifeng 2020-12-21 10:56:06 +08:00
Fuhaifeng adeb374ff6 no message 2020-12-21 10:55:05 +08:00
Fuhaifeng f3fe524699 SocketClient Recode 2020-12-21 10:52:49 +08:00
zhangqiang f6ab1f2c6e 【跨服天梯】 提交 2020-12-18 20:43:31 +08:00
zhangqiang 642ae52cfa 【跨服天梯】 提交 2020-12-18 20:42:53 +08:00
JieLing fa24af770b 【协议】战斗协议添加id字段 2020-12-18 19:38:18 +08:00
gaoxin 79f6090afb 【协议】回滚系统消息item字段类型 2020-12-18 18:22:52 +08:00
gaoxin eeb7ecba91 【资源】资源名重复修改 2020-12-18 18:01:08 +08:00
gaoxin 48c9384fde 【资源】资源名重复修改 2020-12-18 17:58:47 +08:00
gaoxin ec47ec2b1c 【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据 2020-12-18 16:51:28 +08:00
gaoxin ef1ced3ef7 【战报系统】基础功能添加 2020-12-18 16:51:13 +08:00
gaoxin c699c2f216 【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据 2020-12-18 16:27:24 +08:00
Fuhaifeng 306997263d no message 2020-12-18 14:45:19 +08:00
Fuhaifeng 7a03b1277e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into Dev_Fuhaifeng
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta
2020-12-18 14:34:55 +08:00
ZhangBiao 72f2dd0e90 【主题活动】删除多余的预设 2020-12-18 14:05:17 +08:00
ZhangBiao a1dcc091fd 【主题活动】删除多余的预设 2020-12-18 14:03:15 +08:00
Fuhaifeng 5d00d1adf0 BtView 事件防止注入 2020-12-18 13:56:58 +08:00
ZhangBiao 0692fbf799 【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285)
2020-12-18 12:02:42 +08:00
ZhangBiao c50ba93285 【森罗幻境】重置事件点不触发修复 2020-12-18 12:00:52 +08:00
ZhangBiao 1431423c4f 【森罗幻境】移动过程中打开其他界面问题修复 2020-12-18 11:39:01 +08:00
ZhangBiao 223b816a98 【青龙秘宝】青龙秘宝等级购买报错修复 2020-12-18 11:38:47 +08:00