762 Commits

Author SHA1 Message Date
xiekaidong
2ce21cba6d 连击提示 2023-07-05 11:23:19 +08:00
Fang
7000dff1bb 竞技场fix 2023-07-05 10:52:36 +08:00
xiekaidong
2e605fabc0 适配 2023-07-05 10:42:39 +08:00
xiekaidong
c5ec2e1853 竞技场任务 2023-07-05 10:16:00 +08:00
xiekaidong
ca456f4bbe bug修复 2023-07-04 20:21:48 +08:00
xiekaidong
0320ef81bd prefab资源检查,更新字体 2023-07-04 20:16:20 +08:00
Fang
98a14c54c2 段位图标重叠fix 2023-07-04 18:50:44 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
cc0b2c05f8 战斗速度 2023-07-04 18:25:20 +08:00
xiekaidong
f660bfe4e7 客服红点 2023-07-04 18:15:04 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
c4b290c735 临时处理一下 2023-07-04 15:52:07 +08:00
xiekaidong
c3789374c6 更新配置 2023-07-04 15:38:28 +08:00
xiekaidong
83b8dbe82d Merge branch 'dev' into arena
# Conflicts:
#	Assets/arts/atlas/ui/common.spriteatlas
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/common/data_manager.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
#	Assets/lua/app/userdata/hero/hero_data.lua.bytes
#	Assets/proto/protocol.bytes
2023-07-04 15:33:45 +08:00
Fang
47fa64a007 中途退出不重置对手 2023-07-04 15:25:06 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
xiekaidong
d2a75b56d1 竞技场节奏调整 2023-07-04 10:55:31 +08:00
xiekaidong
2867cae558 客服红点 2023-07-04 10:42:37 +08:00
xiekaidong
efb2fc57ba 竞技场弹窗礼包 2023-07-03 20:02:46 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
Fang
007e810cf2 动效添加、替图 2023-07-03 17:17:36 +08:00
xiekaidong
b7fb8bff59 评价弹窗 2023-07-03 15:57:42 +08:00
xiekaidong
ae9b933f0c google支付问题 2023-07-03 14:25:26 +08:00
Fang
c4dabad5c5 编译 2023-07-03 14:16:50 +08:00
xiekaidong
d4828dc537 评价弹窗 2023-07-03 11:34:53 +08:00
xiekaidong
6df7c9294f 英雄红点优化 2023-07-03 10:06:20 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
03cce7d521 战斗处理 2023-06-30 16:04:26 +08:00
xiekaidong
ad57cef6ea 竞技场节奏调整 2023-06-30 14:46:02 +08:00
xiekaidong
826cdd1c32 战斗系数 2023-06-29 21:57:26 +08:00
xiekaidong
cbca95b111 战斗bug修复 2023-06-29 21:25:44 +08:00
xiekaidong
458d03cd53 战斗调整 2023-06-29 21:14:38 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
d9e859946e bug修复 2023-06-29 14:43:16 +08:00
Fang
14790f04b8 审核处理 2023-06-21 21:21:22 +08:00
xiekaidong
06191c7e8c bug修复 2023-06-21 17:16:12 +08:00
xiekaidong
46d7ebb42e 调整格子效果生效顺序 2023-06-21 16:03:04 +08:00
Fang
38619144f6 显示fix 2023-06-21 15:17:57 +08:00
chenxi
420d627962 ab name 2023-06-21 14:10:15 +08:00
chenxi
0bb3ddcf72 编译 2023-06-21 12:13:42 +08:00
xiekaidong
2f5501281c 审核模式下屏蔽兑换码按钮 2023-06-21 11:49:45 +08:00
chenxi
b56dc5fe04 白名单和审核模式 2023-06-21 11:36:31 +08:00
chenxi
5f9898ee06 更新配置 2023-06-21 11:21:41 +08:00
chenxi
8c7642c41d 编译 2023-06-21 11:18:38 +08:00
chenxi
2d47aa5288 编译 2023-06-20 22:20:16 +08:00
xiekaidong
a6c85e6741 容错 2023-06-20 22:09:40 +08:00
xiekaidong
59895e47bd Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 21:18:32 +08:00
xiekaidong
4f3dc135a2 显示·问题 2023-06-20 21:18:14 +08:00
Fang
9810b012e0 超框 2023-06-20 21:08:40 +08:00