Fang
|
ea746f2851
|
导入武器图片
|
2023-08-15 10:41:35 +08:00 |
|
xiekaidong
|
72ae396c7c
|
更新资源
|
2023-08-14 21:05:53 +08:00 |
|
Fang
|
302452e76d
|
竞技场宝箱弹出优化、bugfix
|
2023-08-11 15:50:38 +08:00 |
|
Fang
|
d88a18d48b
|
活动礼包弹出逻辑补充
|
2023-08-11 15:09:15 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
Fang
|
bdcfb12f52
|
导入素材
|
2023-08-11 12:00:02 +08:00 |
|
xiekaidong
|
326f35d983
|
替换资源
|
2023-08-10 19:52:31 +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 |
|
Fang
|
704fc389cb
|
替图、编译
|
2023-08-09 16:48:39 +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
|
a1a34631f1
|
上传资源
|
2023-08-09 09:42:07 +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
|
d49083b507
|
上传竞技场第二赛季资源
|
2023-08-08 14:54:28 +08:00 |
|
xiekaidong
|
ee6e367889
|
上传背景
|
2023-08-08 11:26:54 +08:00 |
|
xiekaidong
|
a199c25d16
|
木棍边缘障碍物
|
2023-08-02 18:07:58 +08:00 |
|
Fang
|
46cf427dbd
|
添加item图片资源
|
2023-08-02 15:28:27 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
251ca6a3a7
|
资源调整
|
2023-07-25 21:07:10 +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 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +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 |
|
Fang
|
6b52dc9f1d
|
支线基金
|
2023-07-24 11:54:43 +08:00 |
|
xiekaidong
|
c61a2fb229
|
增加资源
|
2023-07-24 11:52:29 +08:00 |
|
chenxi
|
a063c83a48
|
上传资源
|
2023-07-23 18:42:20 +08:00 |
|
chenxi
|
4cff3d6cd2
|
更新资源
|
2023-07-23 18:35:09 +08:00 |
|
chenxi
|
b0e1f8a98f
|
道具资源
|
2023-07-23 18:05:39 +08:00 |
|
chenxi
|
431fad8874
|
武器资源
|
2023-07-23 15:45:47 +08:00 |
|
chenxi
|
351f6a2712
|
更新图标资源
|
2023-07-23 15:29:07 +08:00 |
|
xiekaidong
|
f8e0a914b0
|
更新配置
|
2023-07-22 14:02:47 +08:00 |
|
xiekaidong
|
7c9356cc91
|
更新资源
|
2023-07-22 13:57:41 +08:00 |
|
xiekaidong
|
f3a6a84fea
|
资源替换
|
2023-07-21 18:12:45 +08:00 |
|
xiekaidong
|
8bf2ff1968
|
界面调整
|
2023-07-21 16:16:46 +08:00 |
|
xiekaidong
|
c3742f2cb9
|
buff机制修改
|
2023-07-21 11:37:49 +08:00 |
|
Fang
|
02da483630
|
装备升级材料获取
|
2023-07-21 09:51:28 +08:00 |
|
xiekaidong
|
13754e2505
|
更新资源和资源检查
|
2023-07-20 21:51:04 +08:00 |
|
xiekaidong
|
2ac3c391a1
|
Merge branch 'dev_20230725' into dungeon
|
2023-07-20 19:45:03 +08:00 |
|
xiekaidong
|
2e3da36d8f
|
支线副本
|
2023-07-20 19:44:49 +08:00 |
|
Fang
|
047f17e6f3
|
装备系统
|
2023-07-20 19:35:17 +08:00 |
|
xiekaidong
|
b589275d49
|
支线副本资源
|
2023-07-20 15:01:54 +08:00 |
|
xiekaidong
|
1d5e277d77
|
支线副本界面
|
2023-07-19 21:22:42 +08:00 |
|
xiekaidong
|
e979f97f20
|
一些界面
|
2023-07-18 20:59:57 +08:00 |
|