xiekaidong
|
8031fd83f8
|
bug修复
|
2023-08-11 10:05:57 +08:00 |
|
xiekaidong
|
326f35d983
|
替换资源
|
2023-08-10 19:52:31 +08:00 |
|
xiekaidong
|
b08ab375cc
|
bug修复
|
2023-08-10 19:29:42 +08:00 |
|
xiekaidong
|
196e5d881f
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-10 17:57:52 +08:00 |
|
|
|
f381de67ae
|
英雄，皮肤
|
2023-08-10 17:03:20 +08:00 |
|
Fang
|
1aef3a423a
|
皮肤属性增加生命加成显示
|
2023-08-10 16:32:10 +08:00 |
|
xiekaidong
|
7c3699c11d
|
刘海屏
|
2023-08-10 15:57:01 +08:00 |
|
xiekaidong
|
4409c91b2b
|
处理刘海屏
|
2023-08-10 15:31:11 +08:00 |
|
xiekaidong
|
4270fd5dde
|
Merge branch 'app_name' into dev_20230815
|
2023-08-10 14:36:20 +08:00 |
|
xiekaidong
|
77788ca22e
|
bug修复
|
2023-08-10 11:45:35 +08:00 |
|
xiekaidong
|
223e735275
|
更新pb
|
2023-08-10 11:02:45 +08:00 |
|
xiekaidong
|
53e9da7a4f
|
皮肤技能表现
|
2023-08-10 10:49:22 +08:00 |
|
|
|
7f4bed0604
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-10 09:43:00 +08:00 |
|
|
|
ccc6048c4b
|
boss hit
|
2023-08-10 09:42:45 +08:00 |
|
xiekaidong
|
089558c932
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-10 09:41:55 +08:00 |
|
xiekaidong
|
5c1fa9be63
|
更新配置
|
2023-08-10 09:41:33 +08:00 |
|
xiekaidong
|
977b3c8c91
|
Merge branch 'master' into dev_20230815
# Conflicts:
# Assets/lua/app/config/arena_bounty_level.lua.bytes
# Assets/lua/app/config/arena_rank.lua.bytes
# Assets/lua/app/config/avatar_frame.lua.bytes
# Assets/lua/app/config/chapter.lua.bytes
# Assets/lua/app/config/chapter_board.lua.bytes
# Assets/lua/app/config/grid_type.lua.bytes
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/monster_chapter.lua.bytes
# Assets/lua/app/config/monster_daily_challenge.lua.bytes
# Assets/lua/app/config/monster_dungeon_armor.lua.bytes
# Assets/lua/app/config/strings/cn/avatar.lua.bytes
# Assets/lua/app/config/strings/cn/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/en/avatar.lua.bytes
# Assets/lua/app/config/strings/en/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/es/avatar.lua.bytes
# Assets/lua/app/config/strings/es/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/es/item.lua.bytes
# Assets/lua/app/config/strings/es/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/id/avatar.lua.bytes
# Assets/lua/app/config/strings/id/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/id/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/ja/avatar.lua.bytes
# Assets/lua/app/config/strings/ja/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ja/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/ko/avatar.lua.bytes
# Assets/lua/app/config/strings/ko/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/ko/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/pt/avatar.lua.bytes
# Assets/lua/app/config/strings/pt/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/pt/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/th/avatar.lua.bytes
# Assets/lua/app/config/strings/th/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/th/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/vi/avatar.lua.bytes
# Assets/lua/app/config/strings/vi/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/vi/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/zh/avatar.lua.bytes
# Assets/lua/app/config/strings/zh/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
# Assets/lua/app/config/summon.lua.bytes
# Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
# Assets/lua/app/module/battle/team/battle_team.lua.bytes
# Assets/lua/app/module/shop/shop_manager.lua.bytes
|
2023-08-10 09:38:07 +08:00 |
|
zhangpengfei
|
b0cf3b9798
|
小怪hit帧修改
|
2023-08-10 09:34:30 +08:00 |
|
chenxi
|
e38ce4e68e
|
接入Moloco广告适配器
|
2023-08-09 22:10:47 +08:00 |
|
xiekaidong
|
bc6510f5a9
|
提升版本号
v.1.1.7_android
v.1.2.7_ios
|
2023-08-09 17:36:09 +08:00 |
|
Fang
|
fadd825990
|
更新协议
|
2023-08-09 17:34:50 +08:00 |
|
Fang
|
591784bef1
|
更表
|
2023-08-09 17:25:52 +08:00 |
|
xiekaidong
|
f0c490b2ca
|
资源检查
|
2023-08-09 17:00:39 +08:00 |
|
xiekaidong
|
30b58e0e39
|
删除打印
|
2023-08-09 16:51:27 +08:00 |
|
Fang
|
704fc389cb
|
替图、编译
|
2023-08-09 16:48:39 +08:00 |
|
xiekaidong
|
7a20bfb816
|
编译lua
|
2023-08-09 16:17:58 +08:00 |
|
xiekaidong
|
b6acc8beee
|
更新资源
|
2023-08-09 16:07:36 +08:00 |
|
xiekaidong
|
56abe8a87b
|
添加打印
|
2023-08-09 16:03:28 +08:00 |
|
陈希
|
6c75146c10
|
Merge branch 'fang/皮肤' into 'dev_20230815'
皮肤功能
See merge request b6-client/b6-unity!10
|
2023-08-09 07:28:11 +00:00 |
|
xiekaidong
|
fcb9d940b5
|
更新资源
|
2023-08-09 15:10:54 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|
xiekaidong
|
5706a029be
|
安卓app名称
|
2023-08-09 13:09:19 +08:00 |
|
Fang
|
a6288069d8
|
装备礼包弹出fix
|
2023-08-09 10:58:45 +08:00 |
|
xiekaidong
|
bcb726187e
|
bug修复
|
2023-08-09 10:26:58 +08:00 |
|
xiekaidong
|
519bda505a
|
金猪
|
2023-08-09 10:21:52 +08:00 |
|
Fang
|
d3dbfd0b51
|
1、材料本扫荡后次数刷新不及时fix 2、装备副本扫荡触发礼包未立即弹出fix
|
2023-08-09 10:20:31 +08:00 |
|
xiekaidong
|
6f1d287ee4
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-09 09:42:11 +08:00 |
|
xiekaidong
|
a1a34631f1
|
上传资源
|
2023-08-09 09:42:07 +08:00 |
|
zhangpengfei
|
43c31f6e12
|
角色动画修改
|
2023-08-09 09:10:35 +08:00 |
|
|
|
1a8a58c25c
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-08 20:08:15 +08:00 |
|
|
|
f55e845856
|
新英雄
|
2023-08-08 20:08:06 +08:00 |
|
zhangpengfei
|
446a83490d
|
小怪上传
|
2023-08-08 20:07:34 +08:00 |
|
|
|
94acba74c4
|
新增BOSS
|
2023-08-08 19:54:23 +08:00 |
|
xiekaidong
|
cb2c2669c2
|
bug修复
|
2023-08-08 18:10:34 +08:00 |
|
xiekaidong
|
4d8561a55f
|
更新资源
|
2023-08-08 17:59:29 +08:00 |
|
xiekaidong
|
373e5c22cc
|
反伤bug修复
|
2023-08-08 17:49:23 +08:00 |
|
xiekaidong
|
f7dcecd348
|
排序
|
2023-08-08 16:56:19 +08:00 |
|
xiekaidong
|
42570059b1
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-08 16:39:15 +08:00 |
|
xiekaidong
|
ce7ad3cb8c
|
新buff和新机制
|
2023-08-08 16:39:03 +08:00 |
|
Fang
|
d145279d29
|
导入icon资源
|
2023-08-08 16:28:23 +08:00 |
|
