|
|
22baebeab0
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 15:44:39 +08:00 |
|
|
|
44228b01fe
|
11111
|
2023-08-11 15:44:30 +08:00 |
|
xiekaidong
|
187eda1f35
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
# Conflicts:
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
|
2023-08-11 15:18:03 +08:00 |
|
xiekaidong
|
62907b1a83
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:49 +08:00 |
|
Fang
|
d88a18d48b
|
活动礼包弹出逻辑补充
|
2023-08-11 15:09:15 +08:00 |
|
|
|
287361e39a
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 14:53:09 +08:00 |
|
|
|
834d12bda4
|
1111
|
2023-08-11 14:53:00 +08:00 |
|
Fang
|
0fda6326b4
|
编译
|
2023-08-11 14:28:01 +08:00 |
|
|
|
e9bd6c070d
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 12:09:53 +08:00 |
|
|
|
04d54fe957
|
木兰
|
2023-08-11 12:09:42 +08:00 |
|
zhangpengfei
|
9ab3370abd
|
角色修改
|
2023-08-11 12:08:18 +08:00 |
|
陈希
|
51b8d22f79
|
Merge branch 'fang/夏日活动' into 'dev_20230815'
夏日活动功能
See merge request b6-client/b6-unity!11
|
2023-08-11 04:06:00 +00:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
Fang
|
bdcfb12f52
|
导入素材
|
2023-08-11 12:00:02 +08:00 |
|
xiekaidong
|
5f858b5d5b
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 11:25:45 +08:00 |
|
xiekaidong
|
d93593b5fb
|
优化木棍障碍物
|
2023-08-11 11:25:22 +08:00 |
|
|
|
7e235b92ae
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 11:18:17 +08:00 |
|
|
|
4c52c1a18d
|
1111111
|
2023-08-11 11:18:08 +08:00 |
|
xiekaidong
|
c9efe2357e
|
更新pb
|
2023-08-11 10:59:18 +08:00 |
|
xiekaidong
|
f49eaaae84
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 10:41:49 +08:00 |
|
xiekaidong
|
425bfe2fd7
|
更新配置
|
2023-08-11 10:41:28 +08:00 |
|
|
|
80392308a9
|
111111111
|
2023-08-11 10:29:23 +08:00 |
|
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 |
|
xiekaidong
|
695a02a56d
|
修改版本号
v.1.2.8_ios
v1.1.8_android
|
2023-08-10 17:44:45 +08:00 |
|
xiekaidong
|
8d7b172b83
|
bug修复
|
2023-08-10 17:33:53 +08:00 |
|
|
|
f381de67ae
|
英雄，皮肤
|
2023-08-10 17:03:20 +08:00 |
|
Fang
|
1aef3a423a
|
皮肤属性增加生命加成显示
|
2023-08-10 16:32:10 +08:00 |
|
xiekaidong
|
685670afb7
|
bug修复
|
2023-08-10 16:28:00 +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 |
|
