chenxi
|
b51d130b3b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
# Assets/proto/protocol.bytes
|
2023-06-14 15:41:50 +08:00 |
|
chenxi
|
25534ecacb
|
编译
|
2023-06-14 15:40:09 +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 |
|
chenxi
|
45cb348bfc
|
ios支付
|
2023-06-13 18:19:45 +08:00 |
|
chenxi
|
e86d257330
|
merge
|
2023-06-13 10:45:07 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
chenxi
|
20aea655a1
|
支付转菊花
|
2023-06-12 22:19:42 +08:00 |
|
xiekaidong
|
dd104eae3f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:47:25 +08:00 |
|
chenxi
|
0221c6c826
|
sdk参数
|
2023-06-09 19:02:30 +08:00 |
|
chenxi
|
13c49e1e6c
|
支付相关
|
2023-06-09 17:05:29 +08:00 |
|
chenxi
|
f2708125ec
|
编译
|
2023-06-09 11:48:33 +08:00 |
|
chenxi
|
92f0b087c9
|
编译
|
2023-06-08 21:38:54 +08:00 |
|
xiekaidong
|
4efa656afe
|
上报修复
|
2023-06-08 17:07:51 +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 |
|
chenxi
|
29832da12e
|
编译
|
2023-06-06 18:44:31 +08:00 |
|
CloudJ
|
700804df00
|
编译
|
2023-06-06 18:22:26 +08:00 |
|
xiekaidong
|
de983ee4e5
|
战斗bi日志上报
|
2023-06-06 18:07:07 +08:00 |
|
CloudJ
|
4b7294b8ad
|
编译
|
2023-06-06 17:51:48 +08:00 |
|
Fang
|
49af10d8a9
|
战斗退出后显示主界面控制
|
2023-06-06 17:31:34 +08:00 |
|
CloudJ
|
a7756805cb
|
编译
|
2023-06-06 17:12:25 +08:00 |
|
xiekaidong
|
cb667f4e9c
|
bug修复
|
2023-06-06 16:45:39 +08:00 |
|
chenxi
|
f91872672a
|
音效和ab
|
2023-06-06 11:30:15 +08:00 |
|
CloudJ
|
e7d278de0c
|
编译
|
2023-06-06 11:15:26 +08:00 |
|
CloudJ
|
f413a2fadb
|
音效
|
2023-06-06 11:09:18 +08:00 |
|
xiekaidong
|
b2f8e11059
|
音效
|
2023-06-06 11:01:33 +08:00 |
|
xiekaidong
|
d56c7110d7
|
boss预警音效
|
2023-06-06 10:39:04 +08:00 |
|
chenxi
|
c692089e1f
|
编译
|
2023-06-05 22:18:27 +08:00 |
|
chenxi
|
163ff77186
|
编译
|
2023-06-05 21:33:50 +08:00 |
|
xiekaidong
|
9a6732acdd
|
增加棋盘查看字段
|
2023-06-05 21:08:16 +08:00 |
|
chenxi
|
312e1d66e9
|
编译
|
2023-06-05 19:09:06 +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 |
|
Fang
|
6c637656e5
|
编译
|
2023-06-05 10:43:13 +08:00 |
|
chenxi
|
33edfece08
|
替换战令界面
|
2023-06-04 22:38:12 +08:00 |
|
CloudJ
|
03424f4786
|
编译
|
2023-06-02 18:43:49 +08:00 |
|
xiekaidong
|
6de85c5b98
|
bug修复
|
2023-06-02 11:55:05 +08:00 |
|
chenxi
|
0504944c07
|
编译
|
2023-06-01 18:24:41 +08:00 |
|
chenxi
|
a96ec35252
|
编译
|
2023-05-31 22:40:29 +08:00 |
|
chenxi
|
791a81438b
|
绑定账号
|
2023-05-31 22:23:48 +08:00 |
|
chenxi
|
59cfb77e28
|
账号删除
|
2023-05-31 17:54:31 +08:00 |
|
CloudJ
|
e36c841ade
|
编译
|
2023-05-31 15:43:07 +08:00 |
|
xiekaidong
|
0fc01c78b6
|
战斗相关bug修复
|
2023-05-31 14:24:15 +08:00 |
|
Fang
|
0b8904f47a
|
每日挑战界面调整、扣除次数修复
|
2023-05-31 10:27:09 +08:00 |
|
chenxi
|
86a321a568
|
七天乐界面调整
|
2023-05-31 10:12:26 +08:00 |
|
CloudJ
|
71c0d6729b
|
编译
|
2023-05-31 09:46:56 +08:00 |
|
xiekaidong
|
b031fe8a9b
|
更新配置
|
2023-05-30 21:30:41 +08:00 |
|
chenxi
|
8a6f2ac884
|
邮箱加一个开启限制
|
2023-05-30 18:18:56 +08:00 |
|
chenxi
|
2fbe01e673
|
每日挑战
|
2023-05-30 11:45:27 +08:00 |
|