21 Commits

Author SHA1 Message Date
chenxi
45cb348bfc ios支付 2023-06-13 18:19:45 +08:00
chenxi
0221c6c826 sdk参数 2023-06-09 19:02:30 +08:00
chenxi
13c49e1e6c 支付相关 2023-06-09 17:05:29 +08:00
xiekaidong
4efa656afe 上报修复 2023-06-08 17:07:51 +08:00
xiekaidong
cb667f4e9c bug修复 2023-06-06 16:45:39 +08:00
chenxi
7224512691 充值后提示绑定 2023-06-05 18:33:48 +08:00
chenxi
54919c6898 七天乐界面 2023-06-05 18:08:18 +08:00
xiekaidong
92876d1fcd 更改奖励上报 2023-06-05 15:38:30 +08:00
chenxi
33edfece08 替换战令界面 2023-06-04 22:38:12 +08:00
CloudJ
ba4231ea83 编译 2023-05-29 18:08:46 +08:00
chenxi
809fda8619 基金重命名 2023-05-29 10:54:43 +08:00
CloudJ
87ad0eb934 编译 2023-05-26 15:45:26 +08:00
CloudJ
f79e8ebe89 编译 2023-05-25 15:27:25 +08:00
chenxi
edf3b503a4 编译 2023-05-24 21:46:18 +08:00
CloudJ
7eb30359a3 编译 2023-05-24 16:01:10 +08:00
chenxi
165eff0164 金猪和邮件 2023-05-23 17:05:47 +08:00
CloudJ
012dd355ea 编译 2023-05-23 14:20:32 +08:00
chenxi
e5cf6e09bf 战令 2023-05-15 21:34:02 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +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