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
|
c4dabad5c5
|
编译
|
2023-07-03 14:16:50 +08:00 |
|
xiekaidong
|
d4828dc537
|
评价弹窗
|
2023-07-03 11:34:53 +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
|
826cdd1c32
|
战斗系数
|
2023-06-29 21:57:26 +08:00 |
|
xiekaidong
|
cbca95b111
|
战斗bug修复
|
2023-06-29 21:25:44 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
xiekaidong
|
d9e859946e
|
bug修复
|
2023-06-29 14:43:16 +08:00 |
|
xiekaidong
|
46d7ebb42e
|
调整格子效果生效顺序
|
2023-06-21 16:03:04 +08:00 |
|
chenxi
|
8c7642c41d
|
编译
|
2023-06-21 11:18:38 +08:00 |
|
Fang
|
32364f7c4d
|
超框
|
2023-06-20 20:20:23 +08:00 |
|
xiekaidong
|
bb0b9a6673
|
bug修复，上传资源
|
2023-06-20 17:51:19 +08:00 |
|
xiekaidong
|
3fc9c15755
|
bug修复
|
2023-06-20 16:29:21 +08:00 |
|
xiekaidong
|
ec2932edd3
|
bug修复
|
2023-06-20 11:35:39 +08:00 |
|
xiekaidong
|
9d0901dc2b
|
免控
|
2023-06-19 11:55:52 +08:00 |
|
Fang
|
d275c58ad4
|
头像昵称
|
2023-06-19 10:57:28 +08:00 |
|
xiekaidong
|
116fa0ef75
|
bug修复
|
2023-06-19 10:13:34 +08:00 |
|
chenxi
|
3791c54170
|
ab name
|
2023-06-16 21:55:12 +08:00 |
|
xiekaidong
|
da555bd8f3
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:44:43 +08:00 |
|
chenxi
|
da087b9dff
|
维护公告
|
2023-06-16 16:17:09 +08:00 |
|
xiekaidong
|
989a7c63e5
|
火蛇海蛇效果
|
2023-06-16 15:14:33 +08:00 |
|
xiekaidong
|
c0e16123f8
|
bug修复
|
2023-06-16 14:30:30 +08:00 |
|
xiekaidong
|
187dab8ee6
|
bug修复，更新图集
|
2023-06-16 10:59:00 +08:00 |
|
xiekaidong
|
62f45a0392
|
战斗支持血量换皮肤
|
2023-06-15 18:56:07 +08:00 |
|
xiekaidong
|
ef7d1f78cd
|
bug修复
|
2023-06-15 17:53:01 +08:00 |
|
xiekaidong
|
0b5670c7a4
|
每日挑战任务完成情况上报
|
2023-06-15 17:30:49 +08:00 |
|
chenxi
|
c485c58962
|
设置和兑换码
|
2023-06-15 16:40:17 +08:00 |
|
xiekaidong
|
402aaa1ad1
|
副本开启引导触发、神秘宝箱开启音效
|
2023-06-15 15:33:09 +08:00 |
|
xiekaidong
|
2b3f4255a0
|
buff显示修改
|
2023-06-15 14:18:22 +08:00 |
|
xiekaidong
|
972a339c4a
|
bug修复
|
2023-06-14 19:05:47 +08:00 |
|
xiekaidong
|
e98b0d2368
|
伤害数字重叠问题
|
2023-06-14 18:35:41 +08:00 |
|
xiekaidong
|
a3a9ac1fb7
|
连携提示
|
2023-06-14 18:21:48 +08:00 |
|
chenxi
|
7a141820b4
|
merge
|
2023-06-14 15:43:17 +08:00 |
|
chenxi
|
b51d130b3b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
# Assets/proto/protocol.bytes
|
2023-06-14 15:41:50 +08:00 |
|
chenxi
|
25534ecacb
|
编译
|
2023-06-14 15:40:09 +08:00 |
|
Fang
|
ee97ab1c93
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/config/strings/cn/item.lua.bytes
# Assets/lua/app/config/strings/de/item.lua.bytes
# Assets/lua/app/config/strings/en/global.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/fr/item.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/ru/item.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/zh/global.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/module/battle/battle_const.lua.bytes
# Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
# Assets/lua/app/ui/battle/battle_ui.lua.bytes
# Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
|
2023-06-14 11:42:03 +08:00 |
|
xiekaidong
|
523c2e4a7f
|
交换一下战斗双方死亡的判定顺序
|
2023-06-14 10:43:29 +08:00 |
|
xiekaidong
|
2c10467ffc
|
对手先手期间，英雄不会播放死亡动作bug修复
|
2023-06-14 10:03:52 +08:00 |
|
chenxi
|
481af73ddb
|
cdkey临时界面
|
2023-06-13 20:54:29 +08:00 |
|