ZhangBiao
|
f8800771d8
|
【登录界面】增加视频
|
2021-06-02 16:43:56 +08:00 |
ZhangBiao
|
5c198bc9ec
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 16:20:15 +08:00 |
gaoxin
|
c2ea84ce81
|
【资源】登录界面视频添加
|
2021-06-02 16:19:53 +08:00 |
ZhangBiao
|
336cbd2c35
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 15:47:35 +08:00 |
ZhangBiao
|
2c677c0093
|
【牛氣衝天】报错修改
|
2021-06-02 15:47:26 +08:00 |
jiaoyangna
|
43941d2c7b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 15:45:06 +08:00 |
jiaoyangna
|
755edc5913
|
百宝商会特效提交
|
2021-06-02 15:42:46 +08:00 |
ZhangBiao
|
592fad463d
|
【玉皇大帝】入口顯示
|
2021-06-02 15:12:44 +08:00 |
ZhangBiao
|
a6c7de8151
|
【主界面】成长礼包入口提交
|
2021-06-02 14:56:09 +08:00 |
ZhangBiao
|
0798248214
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 14:50:26 +08:00 |
ZhangBiao
|
e1145deced
|
【玉皇大帝入口】如果购买完成长礼包,就不显示
|
2021-06-02 14:50:18 +08:00 |
wangzhenxing
|
6d41cde054
|
[称号]=======称号无法卸下修改提交,称号高度修改
|
2021-06-02 14:47:54 +08:00 |
zhangqiang
|
2cbe6e3617
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 14:35:18 +08:00 |
zhangqiang
|
8ccafd974e
|
【鸿蒙阵】文字显示错误
|
2021-06-02 14:34:59 +08:00 |
gaoxin
|
4eea852340
|
【称号】修复主界面称号偶现没有特效的问题,聊天界面称号逻辑修改
|
2021-06-02 14:34:51 +08:00 |
gaoxin
|
548f3f9f00
|
【称号】修复老包称号显示错误的问题
|
2021-06-02 14:32:16 +08:00 |
ZhangBiao
|
c2f905940b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 11:34:22 +08:00 |
ZhangBiao
|
61f516f991
|
【修行】增加突破成功提示
|
2021-06-02 11:34:11 +08:00 |
wangzhenxing
|
2de61d062d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 11:29:45 +08:00 |
wangzhenxing
|
ba04ea8e71
|
【心愿抽卡】====修改概率显示,必得剩余次数修改
|
2021-06-02 11:29:26 +08:00 |
gaoxin
|
4bd4721069
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 11:25:11 +08:00 |
gaoxin
|
dbcaf8e5ca
|
【称号】踏碎凌霄称号显示优化
|
2021-06-02 11:25:06 +08:00 |
ZhangBiao
|
31b7ba2508
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 11:09:02 +08:00 |
ZhangBiao
|
6b0e14d55d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 11:08:33 +08:00 |
ZhangBiao
|
7679f85af3
|
【修行】图标调整
|
2021-06-02 11:08:24 +08:00 |
jiaoyangna
|
fd8d35fabb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 11:08:20 +08:00 |
jiaoyangna
|
ec55dc15af
|
红点提交
|
2021-06-02 11:08:03 +08:00 |
zhangqiang
|
18053ad192
|
【魂印】前端容错
|
2021-06-02 10:16:57 +08:00 |
gaoxin
|
39bb3d5c06
|
【称号】修改称号节点为通用节点
|
2021-06-01 21:13:03 +08:00 |
jiaoyangna
|
b2a71d4f8c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 20:22:30 +08:00 |
jiaoyangna
|
b345d54cbe
|
剧情修改提交
|
2021-06-01 20:22:14 +08:00 |
zhangqiang
|
f9af054ec6
|
点将台10连加入红点提示 2
|
2021-06-01 20:10:34 +08:00 |
ZhangBiao
|
1c19adf8ca
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 20:02:57 +08:00 |
ZhangBiao
|
681b3b63bb
|
【每日礼包】特效问题修改
|
2021-06-01 20:02:48 +08:00 |
zhangqiang
|
fb8410eaa5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 19:48:05 +08:00 |
zhangqiang
|
859bd6679e
|
点将台10连加入红点提示
|
2021-06-01 19:47:54 +08:00 |
gaoxin
|
8ec2d60c3f
|
【粒子特效】缩放接口不再对gameobject进行缩放
|
2021-06-01 18:08:40 +08:00 |
gaoxin
|
a923acdcb1
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 18:08:05 +08:00 |
gaoxin
|
61be59d1f3
|
【称号】显示优化
|
2021-06-01 18:08:00 +08:00 |
jiaoyangna
|
bd8fabff53
|
【每日礼包】停留界面等待刷新,显示00:00:00需要切换页前恢复正常
|
2021-06-01 18:04:47 +08:00 |
jiaoyangna
|
5be197ea1f
|
【每日礼包】停留界面等待刷新,显示00:00:00需要切换页前恢复正常
|
2021-06-01 17:52:07 +08:00 |
jiaoyangna
|
95fbdc63c5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 17:45:13 +08:00 |
jiaoyangna
|
83bc0a2c21
|
【每日礼包】停留界面等待刷新,显示00:00:00需要切换页前恢复正常
|
2021-06-01 17:44:55 +08:00 |
gaoxin
|
208f9ec119
|
【loading】修复loading条未到100%文字显示已经到100%
|
2021-06-01 17:34:08 +08:00 |
jiaoyangna
|
a1ac495ca2
|
红点提交
|
2021-06-01 17:22:23 +08:00 |
jiaoyangna
|
e6dc31fb9b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 17:11:19 +08:00 |
jiaoyangna
|
32750ffa34
|
【无尽副本】未激活五星神将或未选择五星神将不允许进入地图
|
2021-06-01 17:10:07 +08:00 |
wangzhenxing
|
54d0501bed
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 16:59:42 +08:00 |
wangzhenxing
|
5bcfe86999
|
【公会红包】====红包刷新逻辑修改
|
2021-06-01 16:59:27 +08:00 |
ZhangBiao
|
45df61f535
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 16:55:13 +08:00 |
ZhangBiao
|
0cfcbd8821
|
【星辰商店】入口光效穿透
|
2021-06-01 16:54:30 +08:00 |
jiaoyangna
|
c4c0cb5a69
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 16:53:25 +08:00 |
jiaoyangna
|
259155fe52
|
【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
|
2021-06-01 16:53:08 +08:00 |
ZhangBiao
|
be9a815d00
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 16:39:30 +08:00 |
ZhangBiao
|
9f586818c2
|
【修行】特效问题提交
|
2021-06-01 16:39:09 +08:00 |
gaoxin
|
d688a013bb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 16:30:22 +08:00 |
gaoxin
|
2c7b62e2e4
|
【资源】物品资源导入
|
2021-06-01 16:30:17 +08:00 |
zhangqiang
|
3516118d51
|
【山河社稷图】宝箱节点加特效
|
2021-06-01 15:48:29 +08:00 |
gaoxin
|
58faec4feb
|
【红点】主界面鸿蒙阵红点没有清除
|
2021-06-01 15:44:18 +08:00 |
ZhangBiao
|
7befa27a1d
|
【功能引导】首充引导,在入口栏下拉状态下引导,会引导收起
|
2021-06-01 15:11:03 +08:00 |
ZhangBiao
|
857d52c057
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 14:59:07 +08:00 |
ZhangBiao
|
2a4927477c
|
【主题活动】跳转问题
|
2021-06-01 14:58:57 +08:00 |
jiaoyangna
|
8f31b07d52
|
主城百宝时间修改提交
|
2021-06-01 14:54:46 +08:00 |
jiaoyangna
|
162cea9631
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 14:50:10 +08:00 |
jiaoyangna
|
872a9c57ac
|
百宝修改提交
|
2021-06-01 14:49:51 +08:00 |
wangzhenxing
|
aa3171aef7
|
[抽卡祈愿]======活动报错修改
|
2021-06-01 14:41:28 +08:00 |
jiaoyangna
|
dd990fd4b2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 14:15:24 +08:00 |
jiaoyangna
|
1f1d9f6ff2
|
活动页签修改提交
|
2021-06-01 14:12:49 +08:00 |
gaoxin
|
a7fad33250
|
【tip】修复会遮挡点击事件的问题
|
2021-06-01 14:09:14 +08:00 |
ZhangBiao
|
8c6ec719f0
|
【名字颜色】排行榜首页颜色
|
2021-06-01 14:02:25 +08:00 |
ZhangBiao
|
3ef54596d3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 13:54:32 +08:00 |
ZhangBiao
|
c98aa8c703
|
【修行】增加属性提升提示
|
2021-06-01 13:54:21 +08:00 |
jiaoyangna
|
d82bbbf579
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 13:54:05 +08:00 |
jiaoyangna
|
a1bc2ae463
|
活动修改提交
|
2021-06-01 13:53:47 +08:00 |
zhangqiang
|
7048691167
|
【心愿抽卡】十连没音效
|
2021-06-01 13:42:36 +08:00 |
jiaoyangna
|
ad004ddc5e
|
限时召唤修改提交
|
2021-06-01 11:46:00 +08:00 |
jiaoyangna
|
a60e73f5ef
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 11:45:19 +08:00 |
jiaoyangna
|
12fcc3ea14
|
【百宝商会】剩余时间显示错误,应显示当天刷新时间
|
2021-06-01 11:44:49 +08:00 |
zhangqiang
|
ba93c4e861
|
【抽卡跳过音效没有跳过】
|
2021-06-01 11:16:37 +08:00 |
gaoxin
|
26511c3c5b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 11:05:20 +08:00 |
gaoxin
|
16eacf1a47
|
【打包工具】修改提交命令
|
2021-06-01 11:02:08 +08:00 |
gaoxin
|
8f29aa0cf8
|
【打包工具】添加是否要提交到GIt的判断
|
2021-06-01 11:01:04 +08:00 |
jiaoyangna
|
df94ccee38
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 10:59:10 +08:00 |
jiaoyangna
|
5c778aad22
|
森罗幻境】试炼精气特效消失
|
2021-06-01 10:58:46 +08:00 |
JieLing
|
e322108f26
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 10:56:50 +08:00 |
JieLing
|
4322ac35bd
|
【打包工具】调用GIT命令
|
2021-06-01 10:56:20 +08:00 |
jiaoyangna
|
1e4a316d3e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 10:50:38 +08:00 |
jiaoyangna
|
d7947bcf75
|
关卡奖励与在线奖励存在,山河社稷图图标显示位置在在线奖励上方(图标位置应显示在其下方)
|
2021-06-01 10:50:22 +08:00 |
gaoxin
|
70bc51f319
|
【工具】自动打包工具GIT操作加入
|
2021-06-01 10:41:03 +08:00 |
JieLing
|
3e12b64118
|
【打包工具】修复拷贝提示错误
|
2021-05-31 21:54:13 +08:00 |
gaoxin
|
10deef53cf
|
【更新】更新界面背景加载方式修改
|
2021-05-31 21:36:05 +08:00 |
gaoxin
|
598b92f288
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-31 21:12:40 +08:00 |
gaoxin
|
9a98ff2e0a
|
【工具】拷贝过程添加界面显示
|
2021-05-31 21:12:34 +08:00 |
jiaoyangna
|
5bc754678e
|
报错修改
|
2021-05-31 20:39:46 +08:00 |
gaoxin
|
d8ffbe8600
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-31 20:24:27 +08:00 |
gaoxin
|
595df075ed
|
【工具】打包工具优化
|
2021-05-31 20:24:15 +08:00 |
ZhangBiao
|
bfd8bee59e
|
【青龙秘宝】刷新不及时修改
|
2021-05-31 20:09:19 +08:00 |
gaoxin
|
081ff4c0d8
|
【资源】修行和困难副本预告图标上传
|
2021-05-31 19:20:37 +08:00 |
gaoxin
|
0def3449c3
|
【配置】loading界面背景实现配置
|
2021-05-31 19:19:57 +08:00 |
wangzhenxing
|
5ec2c38563
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-31 18:02:05 +08:00 |