puxuan
|
9c290fa178
|
活动
|
2025-10-07 11:21:54 +08:00 |
|
puxuan
|
dc4c1fc49e
|
活动
|
2025-09-28 16:11:00 +08:00 |
|
puxuan
|
4af4b48bca
|
fix bug
|
2025-09-16 15:28:04 +08:00 |
|
puxuan
|
991d7f52bb
|
fix bug
|
2025-09-05 15:40:40 +08:00 |
|
puxuan
|
ee14aded6a
|
fix bug
|
2025-09-05 14:28:41 +08:00 |
|
puxuan
|
54cdfc3e47
|
抽卡
|
2025-08-11 20:39:27 +08:00 |
|
Fang
|
9d6334e76e
|
新手14天乐
|
2023-09-01 15:35:31 +08:00 |
|
xiekaidong
|
8031fd83f8
|
bug修复
|
2023-08-11 10:05:57 +08:00 |
|
xiekaidong
|
dfb2714266
|
更新配置
|
2023-07-31 16:28:15 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +08:00 |
|
xiekaidong
|
10653fa887
|
修改评价弹窗关卡
|
2023-07-21 09:55:39 +08:00 |
|
xiekaidong
|
61336e5d6c
|
编译lua
|
2023-07-19 20:24:13 +08:00 |
|
xiekaidong
|
8328738e0f
|
优化章节礼包弹出逻辑
|
2023-07-13 16:53:15 +08:00 |
|
xiekaidong
|
e1120e654b
|
编译lua
|
2023-07-12 09:49:10 +08:00 |
|
xiekaidong
|
678d368026
|
一些日志上报混乱修复
|
2023-07-11 11:02:33 +08:00 |
|
Fang
|
7e0c87de1a
|
竞技场挑战前判断阵容、超框
|
2023-07-07 11:55:27 +08:00 |
|
xiekaidong
|
c3789374c6
|
更新配置
|
2023-07-04 15:38:28 +08:00 |
|
Fang
|
0e7f765ca2
|
fix
|
2023-07-03 09:51:15 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
Fang
|
ee97ab1c93
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/skill.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/global.lua.bytes
# Assets/lua/app/config/strings/en/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/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/global.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/module/battle/battle_const.lua.bytes
# Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
# Assets/lua/app/ui/battle/battle_ui.lua.bytes
# Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
|
2023-06-14 11:42:03 +08:00 |
|
xiekaidong
|
47ddf4f7c7
|
更新协议
|
2023-06-12 16:53:24 +08:00 |
|
Fang
|
6c637656e5
|
编译
|
2023-06-05 10:43:13 +08:00 |
|
CloudJ
|
03424f4786
|
编译
|
2023-06-02 18:43:49 +08:00 |
|
chenxi
|
7389ba8509
|
只有主线战斗结算界面显示金猪
|
2023-06-02 12:12:09 +08:00 |
|
xiekaidong
|
0fc01c78b6
|
战斗相关bug修复
|
2023-05-31 14:24:15 +08:00 |
|
chenxi
|
7af6800ea0
|
功能解锁弹窗
|
2023-05-30 15:33:46 +08:00 |
|
chenxi
|
2fbe01e673
|
每日挑战
|
2023-05-30 11:45:27 +08:00 |
|
chenxi
|
feb719eab7
|
英雄解锁
|
2023-05-30 10:20:22 +08:00 |
|
xiekaidong
|
eb07f98711
|
显示优化
|
2023-05-26 16:33:21 +08:00 |
|
chenxi
|
0eaae0108e
|
编译
|
2023-05-26 12:52:15 +08:00 |
|
CloudJ
|
76d6e3d29f
|
compile
|
2023-05-25 18:18:38 +08:00 |
|
CloudJ
|
7eb30359a3
|
编译
|
2023-05-24 16:01:10 +08:00 |
|
chenxi
|
165eff0164
|
金猪和邮件
|
2023-05-23 17:05:47 +08:00 |
|
chenxi
|
2edef87063
|
先屏蔽金猪
|
2023-05-22 11:22:45 +08:00 |
|
xiekaidong
|
36950a4364
|
更新pb
|
2023-05-19 18:23:35 +08:00 |
|
xiekaidong
|
fff1c9260e
|
宝箱
|
2023-05-17 19:20:18 +08:00 |
|
xiekaidong
|
33cad880c9
|
联网
|
2023-05-08 11:03:17 +08:00 |
|
chenxi
|
b6c15f641d
|
编译
|
2023-05-05 15:39:51 +08:00 |
|
xiekaidong
|
4f4f340b11
|
日志打点
|
2023-04-26 18:14:57 +08:00 |
|
xiekaidong
|
7cab14eba5
|
编译lua
|
2023-04-24 10:51:41 +08:00 |
|
chenxi
|
dd040045c9
|
编译
|
2023-04-21 21:25:02 +08:00 |
|
xiekaidong
|
0b47632138
|
bug修复
|
2023-04-21 11:00:32 +08:00 |
|
xiekaidong
|
899fde38c1
|
界面处理
|
2023-04-19 22:31:42 +08:00 |
|
chenxi
|
07dd3631c4
|
编译
|
2023-04-16 23:06:53 +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 |
|