ZhangBiao
|
4b4ae7a608
|
【命格】提交
|
2021-12-10 16:16:41 +08:00 |
ZhangBiao
|
d3a2fdf110
|
【命格】提交
|
2021-12-10 16:07:46 +08:00 |
ZhangBiao
|
1ae26afed2
|
【命格】跳转
|
2021-12-10 15:46:35 +08:00 |
ZhangBiao
|
a3c24ee4b7
|
【命格】提交
|
2021-12-10 15:29:03 +08:00 |
ZhangBiao
|
9140a632f9
|
【命格】提交
|
2021-12-10 14:57:23 +08:00 |
ZhangBiao
|
f09556242d
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 14:16:28 +08:00 |
ZhangBiao
|
982137c9b7
|
【命格】提交
|
2021-12-10 14:14:08 +08:00 |
wangzhenxing
|
cecb0ddfc7
|
【战斗】========被动405 407 409修改
|
2021-12-10 14:01:04 +08:00 |
ZhangBiao
|
82c89e5e7d
|
【命格】提交
|
2021-12-10 13:57:24 +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 |
ZhangBiao
|
f067ae5080
|
【命格】提交
|
2021-12-10 11:40:15 +08:00 |
ZhangBiao
|
bab62f274c
|
【命格】提交
|
2021-12-10 11:01:44 +08:00 |
gaoxin
|
836d216309
|
【战斗】主角出现在战斗中时缺少动画处理
|
2021-12-10 09:57:08 +08:00 |
ZhangBiao
|
e304f2136b
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-09 20:18:21 +08:00 |
ZhangBiao
|
cb5cf43089
|
【命格】提交
|
2021-12-09 20:17:37 +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 |
ZhangBiao
|
d056b1479a
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-09 13:30:30 +08:00 |
ZhangBiao
|
9875630085
|
【命格】提交
|
2021-12-09 13:29:16 +08:00 |
gaoxin
|
10b275ea33
|
【引导】引导类型19:切换到3倍速
|
2021-12-09 11:17:47 +08:00 |
gaoxin
|
34b02496f2
|
【战斗】二倍速,三倍速解锁条件修改,跳过条件修改
|
2021-12-09 09:46:02 +08:00 |
ZhangBiao
|
7bcc95f31f
|
【命格】提交
|
2021-12-08 18:34:56 +08:00 |
ZhangBiao
|
655021fe3f
|
【命格】战力升降显示
|
2021-12-08 18:21:28 +08:00 |
ZhangBiao
|
b52b30ab1e
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-12-08 17:30:54 +08:00 |
ZhangBiao
|
4f1e129473
|
【命格】加成预览提交
|
2021-12-08 17:27:22 +08:00 |
gaoxin
|
f846d6f17e
|
【战斗】加入三倍速
|
2021-12-08 16:39:37 +08:00 |
gaoxin
|
d64715ce01
|
【牛气冲天】页签根据数据判断显隐
|
2021-12-08 15:56:08 +08:00 |
ZhangBiao
|
ae3a2fa3e4
|
【命格】提交
|
2021-12-08 15:40:43 +08:00 |
jiaoyangna
|
49500da08e
|
添加名次显示
|
2021-12-08 14:32:18 +08:00 |
ZhangBiao
|
be16abf79a
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-12-08 14:18:38 +08:00 |
ZhangBiao
|
016780c7bc
|
【命格】命石替换
|
2021-12-08 14:17: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 |
ZhangBiao
|
1efc9fc56b
|
【命格】命石穿戴
|
2021-12-08 09:29:08 +08:00 |
wangzhenxing
|
4c92d13393
|
【战斗】======257被动修改
|
2021-12-07 21:19:14 +08:00 |
gaoxin
|
16c16dda5f
|
【战斗工具】修复无法配置皮肤技能的问题
|
2021-12-07 17:47:22 +08:00 |
ZhangBiao
|
2a68523d05
|
【命格】提交
|
2021-12-07 17:19:07 +08:00 |
gaoxin
|
666e6f51a3
|
【开服福利】最后一档奖励变更为寻仙玉,外面入口还是猴子图片
|
2021-12-07 17:10:43 +08:00 |
wangzhenxing
|
3b1ba253b5
|
[战斗]======表现修改 如果正在释放技能不会播放受击动画
|
2021-12-07 16:33:04 +08:00 |
ZhangBiao
|
a0675baeb8
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-07 16:28:44 +08:00 |
ZhangBiao
|
9509fc7012
|
【命格】提交
|
2021-12-07 16:27:55 +08:00 |
ZhangBiao
|
464ab967ef
|
【命格】提交
|
2021-12-07 15:57:33 +08:00 |