670 Commits

Author SHA1 Message Date
xiekaidong
7f47ebdfd0 修改显示 2023-06-16 11:34:21 +08:00
xiekaidong
187dab8ee6 bug修复,更新图集 2023-06-16 10:59:00 +08:00
chenxi
f04af250ac 编译 2023-06-16 10:37:25 +08:00
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
xiekaidong
4c476a5188 更新配置 2023-06-16 10:09:30 +08:00
chenxi
daddedf98f 上报 2023-06-15 21:00:18 +08:00
chenxi
c647c867d7 支付参数 2023-06-15 20:28:59 +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
2ac2d73e0b 战令红点bug 2023-06-15 16:58:13 +08:00
chenxi
c485c58962 设置和兑换码 2023-06-15 16:40:17 +08:00
Fang
fa28d96027 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:09:12 +08:00
xiekaidong
402aaa1ad1 副本开启引导触发、神秘宝箱开启音效 2023-06-15 15:33:09 +08:00
xiekaidong
2b3f4255a0 buff显示修改 2023-06-15 14:18:22 +08:00
xiekaidong
19084e41f4 bug修复 2023-06-15 14:07:48 +08:00
chenxi
d33cddfcc1 编译 2023-06-15 11:10:37 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
chenxi
175653d91d 支付调整 2023-06-15 10:11:55 +08:00
chenxi
358a41e2ed 参数以及上报 2023-06-14 21:43:46 +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
xiekaidong
b7a592bd51 日志上报 2023-06-14 16:06:21 +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
6ad7ea4135 编译 2023-06-14 14:54:11 +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
xiekaidong
8e3ebe353d 英雄升级特效 2023-06-13 18:50:19 +08:00
chenxi
45cb348bfc ios支付 2023-06-13 18:19:45 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +08:00
chenxi
04ab254222 编译 2023-06-13 15:06:57 +08:00
chenxi
25c4dcd4bd 编译 2023-06-13 14:38:38 +08:00
chenxi
14167e5736 金猪倒计时 2023-06-13 12:00:06 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
chenxi
20aea655a1 支付转菊花 2023-06-12 22:19:42 +08:00
chenxi
e81eab8c4f 编译 2023-06-12 18:27:47 +08:00
xiekaidong
47ddf4f7c7 更新协议 2023-06-12 16:53:24 +08:00
xiekaidong
f48f17db38 攻击距离可配置 2023-06-12 10:38:07 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
chenxi
0221c6c826 sdk参数 2023-06-09 19:02:30 +08:00
chenxi
819d3d3a34 编译 2023-06-09 17:23:42 +08:00