jiaoyangna
|
b85ddde17f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 20:27:19 +08:00 |
jiaoyangna
|
4d9d970907
|
【ID1009372】
点将台10连跳过保留橙将动画
|
2021-06-08 20:27:00 +08:00 |
gaoxin
|
fad04ec385
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 19:29:35 +08:00 |
gaoxin
|
c1ebbaa0b2
|
【sdk】修复sdk无法登录的问题,修改支付时的透传参数
|
2021-06-08 19:29:21 +08:00 |
jiaoyangna
|
4dfe018e82
|
【ID1009397】
四元阵增加置换玉获取提示
|
2021-06-08 18:19:14 +08:00 |
jiaoyangna
|
470e7c4430
|
【ID1009379】
【无尽副本】任务完成后右侧按钮添加光效,与关卡界面相同
|
2021-06-08 18:07:22 +08:00 |
jiaoyangna
|
86f79bee97
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 17:58:43 +08:00 |
jiaoyangna
|
2ed4480d92
|
【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
|
2021-06-08 17:57:59 +08:00 |
gaoxin
|
c2961f8f2d
|
【sdk登录】新增两个参数extData 和 p_appId 草花渠道使用
|
2021-06-08 17:27:24 +08:00 |
jiaoyangna
|
9681a00816
|
【ID1009395】
点将台增加剩余保底次数显示
|
2021-06-08 15:15:13 +08:00 |
jiaoyangna
|
debd1f0a63
|
心愿抽卡 资源提交
|
2021-06-08 14:55:06 +08:00 |
JieLing
|
a3f87bb3e2
|
【包配置】删除对称号特效的配置
|
2021-06-08 14:32:21 +08:00 |
jiaoyangna
|
8df928f686
|
【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
|
2021-06-08 14:29:58 +08:00 |
gaoxin
|
edd8c055cb
|
【称号】显示再优化,老包也能正常显示
|
2021-06-08 14:17:31 +08:00 |
gaoxin
|
638b6e6d3b
|
【称号】优化称号在老包中的显示
|
2021-06-08 14:17:20 +08:00 |
gaoxin
|
22fc263d5b
|
【特效】修复新称号特效显示错误
|
2021-06-08 14:17:13 +08:00 |
gaoxin
|
1e3447f4d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 14:06:17 +08:00 |
gaoxin
|
498bc9a9b5
|
【称号】显示再优化,老包也能正常显示
|
2021-06-08 14:06:12 +08:00 |
jiaoyangna
|
7544256d4e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-08 11:40:58 +08:00 |
jiaoyangna
|
0d5c47f347
|
【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
|
2021-06-08 11:40:40 +08:00 |
gaoxin
|
52e975ccf6
|
【资源】重复名资源修正
|
2021-06-08 11:05:54 +08:00 |
gaoxin
|
8d6168a7d9
|
【称号】优化称号在老包中的显示
|
2021-06-08 11:04:11 +08:00 |
gaoxin
|
be558c88f8
|
【特效】修复新称号特效显示错误
|
2021-06-07 21:28:45 +08:00 |
gaoxin
|
589795813b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 20:56:11 +08:00 |
jiaoyangna
|
24e2646bb8
|
心愿抽卡十连 报错修改
|
2021-06-07 18:06:23 +08:00 |
gaoxin
|
1b55441abc
|
【配置】新增草花渠道相关配置
|
2021-06-07 16:49:58 +08:00 |
jiaoyangna
|
3b5af67d93
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 16:45:03 +08:00 |
jiaoyangna
|
54cc26cb51
|
图片替换修改提交
|
2021-06-07 16:44:42 +08:00 |
gaoxin
|
e971d8e96d
|
【资源】特效根节点transform正确性修复
|
2021-06-07 14:40:38 +08:00 |
ZhangBiao
|
1cfcd3346c
|
Revert "【右上角活动】红点修改"
This reverts commit bbfcdf16e6 .
|
2021-06-07 13:45:48 +08:00 |
ZhangBiao
|
bbfcdf16e6
|
【右上角活动】红点修改
(cherry picked from commit 6c31fa860d )
|
2021-06-07 13:39:57 +08:00 |
ZhangBiao
|
21ba0c629d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 13:32:09 +08:00 |
ZhangBiao
|
6c31fa860d
|
【右上角活动】红点修改
|
2021-06-07 13:32:01 +08:00 |
gaoxin
|
b3eaeb7eb5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 12:04:55 +08:00 |
gaoxin
|
6c23cb0069
|
【特效】蚩尤,崇黑虎特效优化,孙悟空,哪吒,玉皇大帝普通攻击特效添加
|
2021-06-07 12:04:50 +08:00 |
jiaoyangna
|
605073d7ec
|
无尽商店返回无尽副本关闭修改提交
|
2021-06-07 12:00:05 +08:00 |
jiaoyangna
|
4c7decb60b
|
礼包预设特效修改
|
2021-06-07 11:30:01 +08:00 |
ZhangBiao
|
88e8fe21f6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-07 11:18:47 +08:00 |
ZhangBiao
|
a96a61ec77
|
【逐胜之巅】入口调整至左侧
|
2021-06-07 11:18:37 +08:00 |
gaoxin
|
a0c63bd443
|
Merge branch 'china/special' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
# Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua
|
2021-06-07 11:05:05 +08:00 |
gaoxin
|
6308f73308
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
# Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua
|
2021-06-07 11:00:32 +08:00 |
JieLing
|
8d233c01eb
|
【禁言功能】
|
2021-06-07 10:57:05 +08:00 |
gaoxin
|
8518f02751
|
【忽略】添加部分忽略
|
2021-06-07 10:41:31 +08:00 |
gaoxin
|
24ebb4cf9e
|
【热更工具】添加查看热更文件的界面
|
2021-06-07 10:39:27 +08:00 |
gaoxin
|
b95a511dc2
|
【log】manager lateupdate 报错添加一些提示
|
2021-06-07 10:38:47 +08:00 |
gaoxin
|
0b5c529de4
|
【资源】特效资源修正
|
2021-06-05 15:19:43 +08:00 |
gaoxin
|
2db2a38484
|
【资源】蚩尤,崇黑虎特效资源上传
|
2021-06-05 15:10:02 +08:00 |
jiaoyangna
|
c82afde747
|
删除log
|
2021-06-05 11:43:01 +08:00 |
jiaoyangna
|
cbfe1db769
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-05 11:18:45 +08:00 |
jiaoyangna
|
46b4e3cd84
|
删除log
|
2021-06-05 11:18:13 +08:00 |