chenxi
|
25534ecacb
|
编译
|
2023-06-14 15:40:09 +08:00 |
|
chenxi
|
0a41226048
|
merge
|
2023-06-14 15:06:12 +08:00 |
|
chenxi
|
ee09969309
|
cdkey
|
2023-06-14 15:05:17 +08:00 |
|
Fang
|
6ad7ea4135
|
编译
|
2023-06-14 14:54:11 +08:00 |
|
陈希
|
41645150c9
|
Merge branch 'fang/dungeon' into 'dev'
活动副本
See merge request b6-client/b6-unity!2
|
2023-06-14 06:46:15 +00:00 |
|
Fang
|
238135a95a
|
更新图集
|
2023-06-14 11:45:40 +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
|
523c2e4a7f
|
交换一下战斗双方死亡的判定顺序
|
2023-06-14 10:43:29 +08:00 |
|
xiekaidong
|
2c10467ffc
|
对手先手期间，英雄不会播放死亡动作bug修复
|
2023-06-14 10:03:52 +08:00 |
|
xiekaidong
|
5edd97178e
|
上传音效
|
2023-06-14 09:42:03 +08:00 |
|
chenxi
|
0dd3747804
|
维护公告界面
|
2023-06-13 21:01:23 +08:00 |
|
chenxi
|
481af73ddb
|
cdkey临时界面
|
2023-06-13 20:54:29 +08:00 |
|
xiekaidong
|
8e3ebe353d
|
英雄升级特效
|
2023-06-13 18:50:19 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
1bcd6926bd
|
伤害字体动画修改
|
2023-06-13 18:30:53 +08:00 |
|
chenxi
|
45cb348bfc
|
ios支付
|
2023-06-13 18:19:45 +08:00 |
|
xiekaidong
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|
Fang
|
0308d2f57d
|
ui细节调整
|
2023-06-13 17:34:28 +08:00 |
|
chenxi
|
d76eb829c4
|
ios framework
|
2023-06-13 17:21:18 +08:00 |
|
Fang
|
656f096c03
|
ui资源补充替换
|
2023-06-13 16:16:29 +08:00 |
|
xiekaidong
|
59f0cd755b
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:25:06 +08:00 |
|
xiekaidong
|
80d3f8cb17
|
grideffect=6的处理
|
2023-06-13 15:08:42 +08:00 |
|
chenxi
|
04ab254222
|
编译
|
2023-06-13 15:06:57 +08:00 |
|
chenxi
|
25c4dcd4bd
|
编译
|
2023-06-13 14:38:38 +08:00 |
|
chenxi
|
14167e5736
|
金猪倒计时
|
2023-06-13 12:00:06 +08:00 |
|
xiekaidong
|
de0b2828a7
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:46 +08:00 |
|
chenxi
|
f580bbfde6
|
Merge branch 'dev_shenhe' into dev_ios
|
2023-06-13 10:45:34 +08:00 |
|
chenxi
|
e86d257330
|
merge
|
2023-06-13 10:45:07 +08:00 |
|
chenxi
|
c64dcdf8f9
|
苹果账号绑定界面
|
2023-06-13 10:41:58 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
xiekaidong
|
f0ace48b55
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-unity into fang/dungeon
|
2023-06-13 09:22:07 +08:00 |
|
chenxi
|
20aea655a1
|
支付转菊花
|
2023-06-12 22:19:42 +08:00 |
|
xiekaidong
|
89a4550582
|
战斗
|
2023-06-12 18:54:41 +08:00 |
|
Fang
|
9dc58eea91
|
奖励显示逻辑补充
|
2023-06-12 18:33:28 +08:00 |
|
chenxi
|
a33117ce2a
|
改个名字
|
2023-06-12 18:29:17 +08:00 |
|
chenxi
|
e81eab8c4f
|
编译
|
2023-06-12 18:27:47 +08:00 |
|
chenxi
|
5879a62587
|
ios max sdk
|
2023-06-12 17:30:22 +08:00 |
|
Fang
|
f1f805feaf
|
修改预制体
|
2023-06-12 17:14:36 +08:00 |
|
xiekaidong
|
43f5e32691
|
Merge branch 'dev' into fang/dungeon
|
2023-06-12 16:56:24 +08:00 |
|
xiekaidong
|
47ddf4f7c7
|
更新协议
|
2023-06-12 16:53:24 +08:00 |
|
xiekaidong
|
c5965f2315
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-unity into fang/dungeon
# Conflicts:
# Assets/prefabs/ui/main_city/dungeon_comp.prefab
|
2023-06-12 15:44:57 +08:00 |
|
Fang
|
6aa23549f5
|
活动副本
|
2023-06-12 15:40:03 +08:00 |
|
xiekaidong
|
f48f17db38
|
攻击距离可配置
|
2023-06-12 10:38:07 +08:00 |
|
xiekaidong
|
dd104eae3f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:47:25 +08:00 |
|
chenxi
|
8acb3db51d
|
Merge branch 'dev_ios' of git.juzugame.com:b6-client/b6-unity into dev_ios
|
2023-06-09 19:02:37 +08:00 |
|
chenxi
|
0221c6c826
|
sdk参数
|
2023-06-09 19:02:30 +08:00 |
|
Fang
|
2f6f69e513
|
活动副本
|
2023-06-09 18:45:12 +08:00 |
|
macmini
|
948578d65f
|
支付相关
|
2023-06-09 18:34:31 +08:00 |
|
macmini
|
fb060dff29
|
ios支付插件
|
2023-06-09 18:31:50 +08:00 |
|
chenxi
|
13e12481e5
|
iap
|
2023-06-09 18:22:57 +08:00 |
|
xiekaidong
|
05ab7ad8e2
|
Merge branch 'board_editor' into dev
|
2023-06-09 17:35:44 +08:00 |
|