Fang
|
0aba4ec004
|
更表
|
2023-08-14 09:50:16 +08:00 |
|
chenxi
|
b6bf5df071
|
增加一个SDK
|
2023-08-11 23:29:39 +08:00 |
|
chenxi
|
399374dc6c
|
广告sdk
|
2023-08-11 23:06:17 +08:00 |
|
chenxi
|
ad9bb05f62
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815
|
2023-08-11 19:21:25 +08:00 |
|
chenxi
|
f55b2a3aa7
|
安卓sdk
|
2023-08-11 19:21:01 +08:00 |
|
|
|
a63efe7ae5
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 18:53:42 +08:00 |
|
|
|
68f8fb28f4
|
111
|
2023-08-11 18:53:29 +08:00 |
|
|
|
c4c6a1eba9
|
0033
|
2023-08-11 18:39:56 +08:00 |
|
Fang
|
5f53448c75
|
新加颜色生命值加成
|
2023-08-11 18:16:16 +08:00 |
|
xiekaidong
|
353b6186a3
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 17:50:34 +08:00 |
|
xiekaidong
|
80fd0f2e80
|
bug修复
|
2023-08-11 17:50:30 +08:00 |
|
|
|
77d1060ba4
|
0034
|
2023-08-11 17:47:33 +08:00 |
|
|
|
b6ada80d8a
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 17:45:40 +08:00 |
|
|
|
28d7ce9184
|
1111111
|
2023-08-11 17:45:31 +08:00 |
|
zhangpengfei
|
14e182367c
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 17:45:19 +08:00 |
|
zhangpengfei
|
e0fa39ac70
|
角色修改
|
2023-08-11 17:45:10 +08:00 |
|
|
|
d8c10917b6
|
0033
|
2023-08-11 17:41:38 +08:00 |
|
zhangpengfei
|
a814fa6f72
|
角色修改
|
2023-08-11 17:33:24 +08:00 |
|
zhangpengfei
|
4cebf61be2
|
角色上传
|
2023-08-11 17:29:14 +08:00 |
|
|
|
85ad80c339
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 17:17:22 +08:00 |
|
|
|
ca654b45b9
|
p0015小红帽皮肤-p0035
|
2023-08-11 17:17:19 +08:00 |
|
Fang
|
d8c5fb61a3
|
资源替换
|
2023-08-11 17:02:46 +08:00 |
|
|
|
43526eeccb
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 16:47:49 +08:00 |
|
|
|
a99fce750e
|
夏日熊猫
|
2023-08-11 16:47:40 +08:00 |
|
Fang
|
78fac50fc5
|
装备副本界面添加礼包入口
|
2023-08-11 16:35:21 +08:00 |
|
|
|
65e820fa50
|
p0028
|
2023-08-11 16:15:42 +08:00 |
|
Fang
|
30bf431636
|
编译
|
2023-08-11 16:03:20 +08:00 |
|
Fang
|
302452e76d
|
竞技场宝箱弹出优化、bugfix
|
2023-08-11 15:50:38 +08:00 |
|
|
|
22baebeab0
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 15:44:39 +08:00 |
|
|
|
44228b01fe
|
11111
|
2023-08-11 15:44:30 +08:00 |
|
xiekaidong
|
187eda1f35
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
# Conflicts:
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
|
2023-08-11 15:18:03 +08:00 |
|
xiekaidong
|
62907b1a83
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:49 +08:00 |
|
Fang
|
d88a18d48b
|
活动礼包弹出逻辑补充
|
2023-08-11 15:09:15 +08:00 |
|
|
|
287361e39a
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 14:53:09 +08:00 |
|
|
|
834d12bda4
|
1111
|
2023-08-11 14:53:00 +08:00 |
|
Fang
|
0fda6326b4
|
编译
|
2023-08-11 14:28:01 +08:00 |
|
|
|
e9bd6c070d
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 12:09:53 +08:00 |
|
|
|
04d54fe957
|
木兰
|
2023-08-11 12:09:42 +08:00 |
|
zhangpengfei
|
9ab3370abd
|
角色修改
|
2023-08-11 12:08:18 +08:00 |
|
陈希
|
51b8d22f79
|
Merge branch 'fang/夏日活动' into 'dev_20230815'
夏日活动功能
See merge request b6-client/b6-unity!11
|
2023-08-11 04:06:00 +00:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
Fang
|
bdcfb12f52
|
导入素材
|
2023-08-11 12:00:02 +08:00 |
|
xiekaidong
|
5f858b5d5b
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 11:25:45 +08:00 |
|
xiekaidong
|
d93593b5fb
|
优化木棍障碍物
|
2023-08-11 11:25:22 +08:00 |
|
|
|
7e235b92ae
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 11:18:17 +08:00 |
|
|
|
4c52c1a18d
|
1111111
|
2023-08-11 11:18:08 +08:00 |
|
xiekaidong
|
c9efe2357e
|
更新pb
|
2023-08-11 10:59:18 +08:00 |
|
xiekaidong
|
f49eaaae84
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-11 10:41:49 +08:00 |
|
xiekaidong
|
425bfe2fd7
|
更新配置
|
2023-08-11 10:41:28 +08:00 |
|
|
|
80392308a9
|
111111111
|
2023-08-11 10:29:23 +08:00 |
|
