1755 Commits

Author SHA1 Message Date
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
xiekaidong
a79d051903 地图编辑器第一版 2023-06-09 17:35:27 +08:00
chenxi
819d3d3a34 编译 2023-06-09 17:23:42 +08:00
chenxi
e6b10d592f fb参数 2023-06-09 17:22:45 +08:00
chenxi
26f3d09556 替换包名等参数 2023-06-09 17:22:35 +08:00
chenxi
13c49e1e6c 支付相关 2023-06-09 17:05:29 +08:00
chenxi
73d550ef11 proto 2023-06-09 15:06:30 +08:00
chenxi
f2708125ec 编译 2023-06-09 11:48:33 +08:00
chenxi
38d720f49c 更新一下地址 2023-06-09 11:13:45 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
chenxi
ba0a25fde5 编译 2023-06-08 18:32:37 +08:00
chenxi
e43a749623 Merge branch 'master' into dev_ios 2023-06-08 18:28:18 +08:00
chenxi
a7dda023d9 调整一下层级 2023-06-08 17:31:56 +08:00
chenxi
630ff95a07 调整一下位置 2023-06-08 17:31:20 +08:00
chenxi
ffb954a1c8 Merge branch 'dev_ios' of git.juzugame.com:b6-client/b6-unity into dev_ios 2023-06-08 17:23:08 +08:00
chenxi
78c471a38c 先注释firebase推送 2023-06-08 17:23:03 +08:00
chenxi
082c8e1547 Merge branch 'dev_20230608_hotupdate' v0.2.2_android 2023-06-08 17:08:44 +08:00
xiekaidong
4efa656afe 上报修复 2023-06-08 17:07:51 +08:00
chenxi
3c90febf45 多语言 2023-06-08 17:02:48 +08:00
xiekaidong
07a1ca566a bug修复 2023-06-08 16:42:32 +08:00
macmini
8cdb462b4c ios屏蔽IronSource 2023-06-08 16:10:18 +08:00
chenxi
802508573e 删除ironsource的ios库 2023-06-08 11:49:55 +08:00
chenxi
ef03b8dc84 指定firebase版本 2023-06-08 11:27:20 +08:00