21 Commits

Author SHA1 Message Date
xiekaidong
dfb2714266 更新配置 2023-07-31 16:28:15 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
Fang
6b52dc9f1d 支线基金 2023-07-24 11:54:43 +08:00
xiekaidong
01d8ba6a49 木兰试玩 2023-07-10 12:00:46 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
xiekaidong
07a1ca566a bug修复 2023-06-08 16:42:32 +08:00
chenxi
52ad339930 fix bug 2023-06-07 19:50:16 +08:00
Fang
6c637656e5 编译 2023-06-05 10:43:13 +08:00
chenxi
82f8030d2f 战令 2023-05-17 14:41:30 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
chenxi
7c3bf48beb 编译 2023-04-11 21:58:49 +08:00
chenxi
468ded50d3 编译 2023-04-07 22:23:28 +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