jiaoyangna
|
53e04ac0d0
|
红点修改提交
|
2021-12-13 13:46:40 +08:00 |
ZhangBiao
|
6f06f68636
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 12:15:04 +08:00 |
ZhangBiao
|
ab5b654b73
|
【法宝聚灵】增加特效
|
2021-12-13 12:14:46 +08:00 |
wangzhenxing
|
52937f3a67
|
[战斗]======效果133修改,治疗接口添加容错
|
2021-12-13 11:50:50 +08:00 |
ZhangBiao
|
6e92bbd082
|
【红点】主题活动入口显示红点,签到后或领达人活动奖励后,红点消失
|
2021-12-13 11:04:27 +08:00 |
ZhangBiao
|
3bc06e9b8e
|
【白金装备】装备穿戴界面,四星白金装备比五星白金装备排序靠前,其他部位没问题
|
2021-12-13 10:14:54 +08:00 |
gaoxin
|
8ba26cd8b4
|
【协议】公会副本伤害数值类型修改
|
2021-12-10 18:30:26 +08:00 |
gaoxin
|
eeda6a80c5
|
【战斗】修复主角技能卡死
|
2021-12-10 18:27:51 +08:00 |
gaoxin
|
3063e8244c
|
【协议】公会副本伤害数据类型修改
|
2021-12-10 18:09:23 +08:00 |
gaoxin
|
8fa3cfd2d1
|
【月卡】修改月卡激活时的提示文字
|
2021-12-10 17:39:18 +08:00 |
gaoxin
|
3835273079
|
【关卡】条件新增
|
2021-12-10 17:37:07 +08:00 |
gaoxin
|
a8186e776c
|
【月卡】修改月卡激活时的提示文字
|
2021-12-10 17:36:04 +08:00 |
gaoxin
|
d2adaaba8d
|
【特权】二倍速不再判断等级提示
|
2021-12-10 16:39:10 +08:00 |
wangzhenxing
|
307264537c
|
【战斗】======被动301 修改
|
2021-12-10 16:25:34 +08:00 |
jiaoyangna
|
6f34492c24
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 16:09:49 +08:00 |
jiaoyangna
|
9d218ee512
|
文字颜色修改提交
|
2021-12-10 16:09:28 +08:00 |
wangzhenxing
|
150e37ae78
|
[战斗]======效果144修改 护盾buff修改
|
2021-12-10 15:22:18 +08:00 |
jiaoyangna
|
ad38176660
|
报错修改提交
|
2021-12-10 15:08:17 +08:00 |
jiaoyangna
|
586305b681
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 14:58:57 +08:00 |
jiaoyangna
|
9069b2ed2c
|
招募秘宝提交
|
2021-12-10 14:58:14 +08:00 |
wangzhenxing
|
cecb0ddfc7
|
【战斗】========被动405 407 409修改
|
2021-12-10 14:01:04 +08:00 |
gaoxin
|
7bbfa16224
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 13:44:55 +08:00 |
gaoxin
|
c10667f77d
|
【战斗】首领关卡2回合后才可以跳过
|
2021-12-10 13:44:48 +08:00 |
jiaoyangna
|
fe0efcb631
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 13:42:27 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
gaoxin
|
ad58a58843
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 11:58:54 +08:00 |
gaoxin
|
9ec7d07fbb
|
【身外化身剧情】孙悟空可配置为主角
|
2021-12-10 11:58:42 +08:00 |
wangzhenxing
|
33d25289b3
|
【战斗】=======变身卡技能提交
|
2021-12-10 11:52:10 +08:00 |
gaoxin
|
836d216309
|
【战斗】主角出现在战斗中时缺少动画处理
|
2021-12-10 09:57:08 +08:00 |
gaoxin
|
ffe01ddf16
|
【引导战斗】添加根据主角释放技能次数显示对话的功能
|
2021-12-09 18:05:47 +08:00 |
gaoxin
|
6f3774c030
|
【云梦祈福】不再请求数据
|
2021-12-09 18:04:29 +08:00 |
wangzhenxing
|
889a49576c
|
【战斗】=======第五期神魂提交
|
2021-12-09 14:25:02 +08:00 |
gaoxin
|
10b275ea33
|
【引导】引导类型19:切换到3倍速
|
2021-12-09 11:17:47 +08:00 |
gaoxin
|
34b02496f2
|
【战斗】二倍速,三倍速解锁条件修改,跳过条件修改
|
2021-12-09 09:46:02 +08:00 |
gaoxin
|
f846d6f17e
|
【战斗】加入三倍速
|
2021-12-08 16:39:37 +08:00 |
gaoxin
|
d64715ce01
|
【牛气冲天】页签根据数据判断显隐
|
2021-12-08 15:56:08 +08:00 |
jiaoyangna
|
49500da08e
|
添加名次显示
|
2021-12-08 14:32:18 +08:00 |
jiaoyangna
|
1136879d55
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-08 14:03:43 +08:00 |
jiaoyangna
|
9b1ca0135c
|
【ID1010829】
增加开服竞技比拼活动——竞技试炼
|
2021-12-08 14:03:23 +08:00 |
wangzhenxing
|
7277afdf9b
|
[战斗]=====被动257 不灭buff修改
|
2021-12-08 10:30:18 +08:00 |
wangzhenxing
|
4c92d13393
|
【战斗】======257被动修改
|
2021-12-07 21:19:14 +08:00 |
gaoxin
|
16c16dda5f
|
【战斗工具】修复无法配置皮肤技能的问题
|
2021-12-07 17:47:22 +08:00 |
gaoxin
|
666e6f51a3
|
【开服福利】最后一档奖励变更为寻仙玉,外面入口还是猴子图片
|
2021-12-07 17:10:43 +08:00 |
wangzhenxing
|
3b1ba253b5
|
[战斗]======表现修改 如果正在释放技能不会播放受击动画
|
2021-12-07 16:33:04 +08:00 |
ZhangBiao
|
86f1620e7d
|
【连购好礼】活动时间兼容调整
|
2021-12-07 15:22:52 +08:00 |
jiaoyangna
|
9184852070
|
方寸寻宝添加音效
|
2021-12-07 14:41:09 +08:00 |
luyao
|
67a1f24a84
|
方寸转盘音效2个(1整体、1单音)
|
2021-12-07 14:18:18 +08:00 |
wangzhenxing
|
c9f64589d0
|
【战斗】=====被动257修改
|
2021-12-07 13:43:29 +08:00 |
luyao
|
7286bd76a4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-07 13:20:19 +08:00 |
luyao
|
5200a8746b
|
气冲斗牛 技能名称 音效优化
|
2021-12-07 13:20:01 +08:00 |
wangzhenxing
|
35e42ed5f0
|
【战斗】===buff图标资源 回合变化延时修改
|
2021-12-07 13:18:52 +08:00 |
gaoxin
|
32b5e16bea
|
【喜扑IOS】喜扑IOS包sdk无法屏蔽点击事件,不允许主动打开登录界面
|
2021-12-07 11:39:38 +08:00 |
luyao
|
9c1024d9f4
|
牛魔王皮肤 音效(攻击,受击)上传
|
2021-12-07 10:14:51 +08:00 |
luyao
|
0e4ff716e0
|
牛魔王皮肤技能名称 音质优化
|
2021-12-07 10:13:30 +08:00 |
wangzhenxing
|
9ddd7a3ddf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 19:12:59 +08:00 |
wangzhenxing
|
2376358ced
|
【战斗】=====战斗驱动延时修改
|
2021-12-06 19:12:44 +08:00 |
ZhangBiao
|
fe99e89eb9
|
【连购礼包】顶呱深处跳转修改
|
2021-12-06 19:11:45 +08:00 |
wangzhenxing
|
ab6955ba9f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 19:03:13 +08:00 |
wangzhenxing
|
6c5ac0e5de
|
[战斗]======战斗轮回转化添加延时,用于处理 伤害延时
|
2021-12-06 19:03:00 +08:00 |
ZhangBiao
|
9db47caa8e
|
【连购礼包】跳转修改
|
2021-12-06 18:59:57 +08:00 |
ZhangBiao
|
692425511c
|
【寻宝迷踪】增加珍奇宝阁入口
|
2021-12-06 18:44:33 +08:00 |
jiaoyangna
|
38b53b6824
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 17:57:29 +08:00 |
jiaoyangna
|
77949c23e6
|
商店背景蒙黑处理
|
2021-12-06 17:56:47 +08:00 |
ZhangBiao
|
9777eb5916
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 17:52:38 +08:00 |
ZhangBiao
|
c367fc88f4
|
【易经宝库】珍奇宝阁无法进入修改
|
2021-12-06 17:52:27 +08:00 |
jiaoyangna
|
d9f71e2f48
|
大闹天宫添加神魂等级
|
2021-12-06 17:47:14 +08:00 |
jiaoyangna
|
b35bb40ff9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 17:26:23 +08:00 |
jiaoyangna
|
84a33a2a3e
|
十连抽停留位置修改
|
2021-12-06 17:26:03 +08:00 |
wangzhenxing
|
983864f46c
|
【战斗】=====抗暴率 提交字提交
|
2021-12-06 17:13:47 +08:00 |
wangzhenxing
|
81e42565e4
|
[战斗]======被动395修改
|
2021-12-06 17:10:55 +08:00 |
luyao
|
6867a738d8
|
【气冲斗牛】技能名字音效,去除音频前段留白
|
2021-12-06 17:02:20 +08:00 |
ZhangBiao
|
bb4c744ff2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 16:59:20 +08:00 |
ZhangBiao
|
78e8865e95
|
【连购礼包】提交
|
2021-12-06 16:59:10 +08:00 |
luyao
|
44ba0b73b4
|
【音效】meta提交
|
2021-12-06 16:49:31 +08:00 |
luyao
|
d88718f6e6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 16:47:20 +08:00 |
luyao
|
91b80ebbf6
|
【牛魔王皮肤】技能名称音效
|
2021-12-06 16:46:42 +08:00 |
ZhangBiao
|
2c1300cb2d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 16:39:02 +08:00 |
ZhangBiao
|
19294fab2d
|
【连购好礼】购买限购礼包,次数不减,显示问题
|
2021-12-06 16:38:51 +08:00 |
jiaoyangna
|
c83f294a67
|
跳转修改提交
|
2021-12-06 16:31:30 +08:00 |
jiaoyangna
|
306e52d2d3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 16:24:26 +08:00 |
jiaoyangna
|
6036916582
|
身外化身添加跳转
|
2021-12-06 16:22:13 +08:00 |
wangzhenxing
|
06948fe7fd
|
[战斗]======人系普攻特效修改
|
2021-12-06 16:18:50 +08:00 |
ZhangBiao
|
0d11371d87
|
【资源冲突】资源名修改提交
|
2021-12-06 16:15:24 +08:00 |
jiaoyangna
|
8b074afa67
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 16:04:31 +08:00 |
jiaoyangna
|
9ae56712c4
|
添加已获得标志
|
2021-12-06 16:04:01 +08:00 |
wangzhenxing
|
44643920ae
|
【战斗】======被动395 400修改
|
2021-12-06 16:00:50 +08:00 |
jiaoyangna
|
df51b91fb0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 15:54:18 +08:00 |
jiaoyangna
|
da9b75ee80
|
商店添加
|
2021-12-06 15:53:01 +08:00 |
luyao
|
1199b225cd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 15:46:42 +08:00 |
jiaoyangna
|
a0440fa3ae
|
变身卡自选箱修改
|
2021-12-06 15:45:11 +08:00 |
luyao
|
83044f0586
|
Merge branch 'china/dev' into china/dev_res
|
2021-12-06 15:43:40 +08:00 |
jiaoyangna
|
2a3a22a997
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 15:43:24 +08:00 |
jiaoyangna
|
709f125845
|
商店修改
|
2021-12-06 15:43:05 +08:00 |
ZhangBiao
|
50d2066481
|
【零售特惠】跳转错误修改
|
2021-12-06 15:37:53 +08:00 |
luyao
|
45cf7e0ea6
|
牛魔王【气冲斗牛】技能字
|
2021-12-06 15:02:42 +08:00 |
jiaoyangna
|
c78b9d4e27
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 14:51:31 +08:00 |
jiaoyangna
|
fefd3a7fd5
|
变身卡修改提交
|
2021-12-06 14:51:13 +08:00 |
wangzhenxing
|
292df63308
|
【战斗】=======被动 187 276修改
|
2021-12-06 14:34:23 +08:00 |
jiaoyangna
|
88c10d8031
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 14:06:01 +08:00 |
jiaoyangna
|
ab722baa35
|
变身卡修改提交
|
2021-12-06 14:05:43 +08:00 |