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
|
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 |
|
Fang
|
d145279d29
|
导入icon资源
|
2023-08-08 16:28:23 +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
|
ee6e367889
|
上传背景
|
2023-08-08 11:26:54 +08:00 |
|
xiekaidong
|
1bbe630e25
|
Merge branch 'mugun' into dev_20230815
|
2023-08-02 18:08:39 +08:00 |
|
xiekaidong
|
a199c25d16
|
木棍边缘障碍物
|
2023-08-02 18:07:58 +08:00 |
|
Fang
|
46cf427dbd
|
添加item图片资源
|
2023-08-02 15:28:27 +08:00 |
|
zhangpengfei
|
1135253224
|
角色修改
|
2023-08-02 09:15:34 +08:00 |
|
zhangpengfei
|
0812b11677
|
新角色上传
|
2023-08-01 21:02:03 +08:00 |
|
Fang
|
6f13ff7f87
|
添加音效
|
2023-08-01 11:11:29 +08:00 |
|
Fang
|
495b2ff5b6
|
通行证spine加背景
|
2023-08-01 10:00:08 +08:00 |
|
zhangpengfei
|
42d2c1e689
|
角色动画修改
|
2023-07-31 17:48:17 +08:00 |
|
zhangpengfei
|
d5b26101ff
|
角色动画更新
|
2023-07-31 17:33:59 +08:00 |
|
xiekaidong
|
30d6ac5a5e
|
删除模型
|
2023-07-31 17:05:07 +08:00 |
|
zhangpengfei
|
7359fed73e
|
新角色上传
|
2023-07-31 16:54:26 +08:00 |
|
zhangpengfei
|
93f00bcbe4
|
新角色上传
|
2023-07-31 16:48:50 +08:00 |
|
xiekaidong
|
5906b8053b
|
资源检查，设置abName
|
2023-07-25 23:18:24 +08:00 |
|
Fang
|
ccacd36da3
|
更新特效
|
2023-07-25 22:55:31 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
2af5fb2301
|
资源检查，更新配置，编译lua，更新pb
|
2023-07-25 22:09:41 +08:00 |
|
xiekaidong
|
2104d20eed
|
资源检查
|
2023-07-25 22:06:48 +08:00 |
|
xiekaidong
|
728cea36a5
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-25 21:07:19 +08:00 |
|
xiekaidong
|
251ca6a3a7
|
资源调整
|
2023-07-25 21:07:10 +08:00 |
|
Fang
|
298a77cb44
|
显示修复、导入特效文件
|
2023-07-25 21:02:08 +08:00 |
|
xiekaidong
|
abe953ab9e
|
更新资源
|
2023-07-25 16:39:02 +08:00 |
|
xiekaidong
|
8cdcbd5c1f
|
多语言
|
2023-07-25 16:36:56 +08:00 |
|
xiekaidong
|
e0e6ebfd4b
|
显示调整
|
2023-07-24 22:01:10 +08:00 |
|
Fang
|
60652a2829
|
防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画、武器漂浮动画
|
2023-07-24 21:07:54 +08:00 |
|
|
|
5b026d2d96
|
装备动画
|
2023-07-24 20:34:42 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +08:00 |
|
Fang
|
7879d441bd
|
道具获取扫荡文案修改、武器界面加anim组件
|
2023-07-24 15:59:13 +08:00 |
|
Fang
|
704dac4fa7
|
礼包资源上传、bug_fix
|
2023-07-24 15:13:32 +08:00 |
|
Fang
|
d5c0fb562f
|
bug fix
|
2023-07-24 14:37:35 +08:00 |
|
陈希
|
1dc21c1cbd
|
Merge branch 'fang/支线基金' into 'dev_20230725'
支线基金
See merge request b6-client/b6-unity!9
|
2023-07-24 05:19:45 +00:00 |
|
|
|
f490ca5040
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 11:57:01 +08:00 |
|
|
|
e52240330f
|
111111
|
2023-07-24 11:56:47 +08:00 |
|
Fang
|
6b52dc9f1d
|
支线基金
|
2023-07-24 11:54:43 +08:00 |
|
