chenxi
|
764f5ee33a
|
ios支付
|
2023-06-15 19:13:44 +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
|
08287696ff
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-15 16:44:39 +08:00 |
|
chenxi
|
569843691f
|
弹出框
|
2023-06-15 16:44:31 +08:00 |
|
xiekaidong
|
9b40cbf37e
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-15 16:40:34 +08:00 |
|
xiekaidong
|
7e76aa871c
|
更新pb
|
2023-06-15 16:40:31 +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
|
e42970fcc0
|
资源修改
|
2023-06-15 15:17:20 +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 |
|
chenxi
|
9196979267
|
支付库使用5.0版本
|
2023-06-15 11:05:06 +08:00 |
|
Fang
|
68ffdffa09
|
Merge branch 'fang/dungeon' into dev
|
2023-06-15 10:47:29 +08:00 |
|
Fang
|
a5ca47d201
|
金币副本新增boss抗性
|
2023-06-15 10:47:11 +08:00 |
|
xiekaidong
|
686a5237d6
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-15 10:25:06 +08:00 |
|
xiekaidong
|
c0a5a33d45
|
棋盘编辑器扩展
|
2023-06-15 10:25:02 +08:00 |
|
chenxi
|
175653d91d
|
支付调整
|
2023-06-15 10:11:55 +08:00 |
|
chenxi
|
358a41e2ed
|
参数以及上报
|
2023-06-14 21:43:46 +08:00 |
|
chenxi
|
3d4726c922
|
正式参数
|
2023-06-14 19:14:37 +08:00 |
|
chenxi
|
f522757923
|
adjust sdk
|
2023-06-14 19:11:34 +08:00 |
|
xiekaidong
|
972a339c4a
|
bug修复
|
2023-06-14 19:05:47 +08:00 |
|
xiekaidong
|
e98b0d2368
|
伤害数字重叠问题
|
2023-06-14 18:35:41 +08:00 |
|
xiekaidong
|
0dca20958b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-14 18:21:52 +08:00 |
|
xiekaidong
|
a3a9ac1fb7
|
连携提示
|
2023-06-14 18:21:48 +08:00 |
|
chenxi
|
1cae530fb2
|
fix bug
|
2023-06-14 16:46:02 +08:00 |
|
xiekaidong
|
b7a592bd51
|
日志上报
|
2023-06-14 16:06:21 +08:00 |
|
chenxi
|
e68ee9e886
|
改名
|
2023-06-14 15:46: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 |
|
chenxi
|
0a41226048
|
merge
|
2023-06-14 15:06:12 +08:00 |
|
chenxi
|
ee09969309
|
cdkey
|
2023-06-14 15:05:17 +08:00 |
|
Fang
|
6ad7ea4135
|
编译
|
2023-06-14 14:54:11 +08:00 |
|
陈希
|
41645150c9
|
Merge branch 'fang/dungeon' into 'dev'
活动副本
See merge request b6-client/b6-unity!2
|
2023-06-14 06:46:15 +00:00 |
|
Fang
|
238135a95a
|
更新图集
|
2023-06-14 11:45:40 +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 |
|
xiekaidong
|
5edd97178e
|
上传音效
|
2023-06-14 09:42:03 +08:00 |
|
chenxi
|
0dd3747804
|
维护公告界面
|
2023-06-13 21:01:23 +08:00 |
|
chenxi
|
481af73ddb
|
cdkey临时界面
|
2023-06-13 20:54:29 +08:00 |
|
xiekaidong
|
8e3ebe353d
|
英雄升级特效
|
2023-06-13 18:50:19 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
1bcd6926bd
|
伤害字体动画修改
|
2023-06-13 18:30:53 +08:00 |
|
chenxi
|
45cb348bfc
|
ios支付
|
2023-06-13 18:19:45 +08:00 |
|
xiekaidong
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|