27 Commits

Author SHA1 Message Date
xiekaidong
57131fb59b 调整 2023-09-12 11:40:45 +08:00
xiekaidong
1e1e4835d3 更新配置 2023-09-12 11:23:24 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
0e962c43ff bug修复 2023-09-05 11:54:38 +08:00
xiekaidong
0d901aff71 bug修复 2023-09-05 10:48:55 +08:00
xiekaidong
df9fb7cabb bug修复 2023-09-04 20:06:58 +08:00
xiekaidong
5666c71d2b 修复一些bug 2023-09-04 18:21:26 +08:00
xiekaidong
8c9945cc63 倒计时优化 2023-09-04 17:25:27 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
Fang
9d6334e76e 新手14天乐 2023-09-01 15:35:31 +08:00
xiekaidong
dccabf26e2 bug修复 2023-08-28 15:16:30 +08:00
xiekaidong
033c2e8d63 英雄基金 2023-08-18 18:10:12 +08:00
Fang
0a5e37baa3 优化夏日活动请求 2023-08-17 14:06:58 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
Fang
16d8c0e858 夏日活动上报修改 2023-08-15 20:40:46 +08:00
Fang
1e7440d170 夏日活动上报 2023-08-15 20:32:37 +08:00
Fang
d88a18d48b 活动礼包弹出逻辑补充 2023-08-11 15:09:15 +08:00
Fang
0fda6326b4 编译 2023-08-11 14:28:01 +08:00
Fang
51891b4d27 夏日活动功能 2023-08-11 12:00:11 +08:00
xiekaidong
8be0258270 日志上报 2023-08-03 14:20:41 +08:00
chenxi
7bfc35f9ab 七天乐 2023-05-26 15:40:44 +08:00
chenxi
0eaae0108e 编译 2023-05-26 12:52:15 +08:00
chenxi
165eff0164 金猪和邮件 2023-05-23 17:05:47 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
chenxi
4809253845 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/textures/ui/common.meta
#	Assets/arts/textures/ui/common/common_alpha.png.meta
#	Assets/arts/textures/ui/common/common_arrow_3.png
#	Assets/arts/textures/ui/common/common_arrow_3.png.meta
#	Assets/arts/textures/ui/common/common_arrow_4.png
#	Assets/arts/textures/ui/common/common_arrow_4.png.meta
#	Assets/arts/textures/ui/common/common_bg_0.png.meta
#	Assets/arts/textures/ui/common/common_bg_3.png
#	Assets/arts/textures/ui/common/common_bg_3.png.meta
#	Assets/arts/textures/ui/common/common_board_10.png
#	Assets/arts/textures/ui/common/common_board_10.png.meta
#	Assets/arts/textures/ui/common/common_board_6.png
#	Assets/arts/textures/ui/common/common_board_6.png.meta
#	Assets/arts/textures/ui/common/common_board_7.png
#	Assets/arts/textures/ui/common/common_board_7.png.meta
#	Assets/arts/textures/ui/common/common_btn_2.png
#	Assets/arts/textures/ui/common/common_btn_2.png.meta
#	Assets/arts/textures/ui/common/common_btn_3.png
#	Assets/arts/textures/ui/common/common_btn_3.png.meta
#	Assets/arts/textures/ui/common/common_check_1.png
#	Assets/arts/textures/ui/common/common_check_1.png.meta
#	Assets/arts/textures/ui/common/common_chest_1.png
#	Assets/arts/textures/ui/common/common_chest_1.png.meta
#	Assets/arts/textures/ui/common/common_dec_1.png
#	Assets/arts/textures/ui/common/common_dec_1.png.meta
#	Assets/arts/textures/ui/common/common_hp.png
#	Assets/arts/textures/ui/common/common_hp.png.meta
#	Assets/arts/textures/ui/common/common_inf.png
#	Assets/arts/textures/ui/common/common_inf.png.meta
#	Assets/arts/textures/ui/common/common_lock_2.png
#	Assets/arts/textures/ui/common/common_lock_2.png.meta
#	Assets/arts/textures/ui/common/common_progress_4.png
#	Assets/arts/textures/ui/common/common_progress_4.png.meta
2023-04-07 15:27:09 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00