237 Commits

Author SHA1 Message Date
Fang
302452e76d 竞技场宝箱弹出优化、bugfix 2023-08-11 15:50:38 +08:00
Fang
51891b4d27 夏日活动功能 2023-08-11 12:00:11 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
xiekaidong
4d8561a55f 更新资源 2023-08-08 17:59:29 +08:00
xiekaidong
a199c25d16 木棍边缘障碍物 2023-08-02 18:07:58 +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
d5c0fb562f bug fix 2023-07-24 14:37:35 +08:00
Fang
6b52dc9f1d 支线基金 2023-07-24 11:54:43 +08:00
xiekaidong
7c9356cc91 更新资源 2023-07-22 13:57:41 +08:00
xiekaidong
8bf2ff1968 界面调整 2023-07-21 16:16:46 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
xiekaidong
2ac3c391a1 Merge branch 'dev_20230725' into dungeon 2023-07-20 19:45:03 +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
0c47811ea5 上传一波资源 2023-07-18 16:35:35 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
bbda3be68f 出包前资源检查和设置ABName 2023-07-12 14:56:43 +08:00
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
Fang
28661c3f03 竞技场布阵优化 2023-07-10 18:27:35 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
868213e321 首包界面和登录界面 2023-07-07 15:48:31 +08:00
xiekaidong
d669300ebf 资源替换 2023-07-06 15:12:10 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
xiekaidong
02f4f8e828 竞技场弹出礼包 2023-07-05 21:01:33 +08:00
xiekaidong
18f5489ddb 更新资源 2023-07-05 15:35:59 +08:00
xiekaidong
4f0174813a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/atlas/ui/battle.asset
2023-07-04 20:13:58 +08:00
xiekaidong
1acaec8748 竞技场波次显示 2023-07-04 20:13:44 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
83b8dbe82d Merge branch 'dev' into arena
# Conflicts:
#	Assets/arts/atlas/ui/common.spriteatlas
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/common/data_manager.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
#	Assets/lua/app/userdata/hero/hero_data.lua.bytes
#	Assets/proto/protocol.bytes
2023-07-04 15:33:45 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
Fang
007e810cf2 动效添加、替图 2023-07-03 17:17:36 +08:00
xiekaidong
b7fb8bff59 评价弹窗 2023-07-03 15:57:42 +08:00
CloudJ
2fe1593610 banner 2023-07-03 15:03:14 +08:00
Fang
813af1dff1 替图 2023-07-03 14:15:22 +08:00
CloudJ
4adea4f216 更换战令图片 2023-07-03 10:28:11 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
xiekaidong
8e804732b5 替换资源 2023-06-30 16:10:57 +08:00
Fang
aae1ec0c8c 完善逻辑 2023-06-29 16:10:22 +08:00
Fang
764645f4d5 逻辑补充 2023-06-28 18:36:07 +08:00
Fang
80c02c4c82 竞技场 2023-06-27 18:27:38 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00
chenxi
86949e1dc5 ab name 2023-06-20 19:59:48 +08:00
Fang
7c79623e92 超框处理 2023-06-20 18:43:08 +08:00