xiekaidong
|
b6acc8beee
|
更新资源
|
2023-08-09 16:07:36 +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
|
519bda505a
|
金猪
|
2023-08-09 10:21:52 +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
|
4d8561a55f
|
更新资源
|
2023-08-08 17:59:29 +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 |
|
xiekaidong
|
5caf199eb1
|
Merge branch 'dev_20230815' into battle
|
2023-08-08 16:00:24 +08:00 |
|
xiekaidong
|
433ec88ba1
|
编译lua
|
2023-08-08 16:00:08 +08:00 |
|
xiekaidong
|
3b61c03934
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# Assets/lua/app/common/local_data.lua.bytes
# Assets/lua/app/config/act_gift.lua.bytes
# Assets/lua/app/config/arena_rank.lua.bytes
# Assets/lua/app/config/chapter_board.lua.bytes
# Assets/lua/app/config/const.lua.bytes
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/cn/buff.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/item.lua.bytes
# Assets/lua/app/config/strings/es/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/ja/skill.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/item.lua.bytes
# Assets/lua/app/config/strings/zh/skill.lua.bytes
# Assets/lua/app/global/global_func.lua.bytes
# Assets/lua/app/module/arena/arena_manager.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
# Assets/lua/app/module/equip/equip_manager.lua.bytes
# Assets/lua/app/module/shop/shop_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
# Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
# Assets/lua/app/ui/ui_manager.lua.bytes
# Assets/proto/protocol.bytes
|
2023-08-08 15:59:22 +08:00 |
|
Fang
|
17bd8e40ec
|
更新图集
|
2023-08-08 14:54:58 +08:00 |
|
Fang
|
d49083b507
|
上传竞技场第二赛季资源
|
2023-08-08 14:54:28 +08:00 |
|
xiekaidong
|
dff0b5b08a
|
更新配置
|
2023-08-08 11:44:40 +08:00 |
|
xiekaidong
|
d43dd92f9e
|
Merge branch 'master' into dev_20230809
# Conflicts:
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/config/grid_type.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/ui/hero/armor_info_comp.lua.bytes
# Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
# Assets/lua/app/userdata/player/player_data.lua.bytes
# Assets/lua/app/userdata/shop/shop_data.lua.bytes
|
2023-08-08 11:42:31 +08:00 |
|
xiekaidong
|
ee6e367889
|
上传背景
|
2023-08-08 11:26:54 +08:00 |
|
xiekaidong
|
bad1e2f2e6
|
新增上报
|
2023-08-07 18:15:55 +08:00 |
|
xiekaidong
|
387492bd3b
|
显示调整
|
2023-08-07 17:21:55 +08:00 |
|
xiekaidong
|
b92c978aad
|
字段修改
|
2023-08-07 15:51:08 +08:00 |
|
xiekaidong
|
654a94eab9
|
编译lua
|
2023-08-07 15:33:52 +08:00 |
|
xiekaidong
|
607c8d3eb6
|
增加上报属性
|
2023-08-07 10:35:37 +08:00 |
|
xiekaidong
|
f52b02b929
|
优化显示
|
2023-08-07 09:37:13 +08:00 |
|
xiekaidong
|
dd1a91051a
|
bug修复
|
2023-08-04 16:59:30 +08:00 |
|
xiekaidong
|
51d857b64e
|
新增两个反伤护盾
|
2023-08-04 16:35:56 +08:00 |
|
xiekaidong
|
499b1726e6
|
修改版本号
v.1.1.6_android
v.1.2.6_ios
|
2023-08-04 16:24:10 +08:00 |
|
Fang
|
8e8320a307
|
礼包界面展示冲突处理
|
2023-08-04 16:00:17 +08:00 |
|
xiekaidong
|
d26fe6cfa2
|
显示修复
|
2023-08-04 15:17:46 +08:00 |
|
xiekaidong
|
56882aaa7e
|
bug修复
|
2023-08-04 15:16:45 +08:00 |
|
xiekaidong
|
a8064bb578
|
棋盘机制调整
|
2023-08-04 14:24:13 +08:00 |
|
xiekaidong
|
a108907fe1
|
显示bug修复
|
2023-08-04 11:34:10 +08:00 |
|
Fang
|
e79f3ea767
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:22 +08:00 |
|
xiekaidong
|
5817c99a36
|
付费项上报异常问题修复
|
2023-08-03 18:10:48 +08:00 |
|
xiekaidong
|
3b182e56c5
|
英雄竞技场段位解锁
|
2023-08-03 18:08:02 +08:00 |
|
xiekaidong
|
80bb50137a
|
bug修复
|
2023-08-03 16:53:57 +08:00 |
|
xiekaidong
|
22b6a4092a
|
bug
|
2023-08-03 16:24:06 +08:00 |
|
xiekaidong
|
e0a51b64ba
|
bug'修复
|
2023-08-03 16:10:15 +08:00 |
|
xiekaidong
|
cd5f588a66
|
统一接口，金币不足提示弹窗询问
|
2023-08-03 14:54:55 +08:00 |
|
xiekaidong
|
8be0258270
|
日志上报
|
2023-08-03 14:20:41 +08:00 |
|
xiekaidong
|
8de4c3340b
|
武器副本增加体力消耗
|
2023-08-03 11:08:40 +08:00 |
|
xiekaidong
|
d24f52825e
|
Merge branch 'dev_20230809' of http://git.juzugame.com/b6-client/b6-unity into dev_20230809
|
2023-08-03 10:24:48 +08:00 |
|
xiekaidong
|
d312e42fac
|
优化局内技能显示
|
2023-08-03 10:24:45 +08:00 |
|
Fang
|
6fabe5b071
|
资源副本扫荡不关闭关卡界面
|
2023-08-03 10:09:36 +08:00 |
|
