ZhangBiao
|
de0498cba8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-17 11:50:54 +08:00 |
ZhangBiao
|
7adae7f006
|
森罗召唤boss后使用炸弹报错问题修复
|
2020-09-17 11:50:44 +08:00 |
jiaoyangna
|
aacf1d029d
|
【十绝阵】敌人编队卡牌应使用无血条版本的边框
|
2020-09-15 14:47:15 +08:00 |
jiaoyangna
|
f0f744602e
|
【累计充值】达成页签没红点
|
2020-09-15 11:21:55 +08:00 |
jiaoyangna
|
4d2c5e15ba
|
【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框
|
2020-09-15 10:28:34 +08:00 |
jiaoyangna
|
ff3c5f147e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-14 18:31:33 +08:00 |
jiaoyangna
|
9745834de4
|
添加动画
|
2020-09-14 18:31:21 +08:00 |
ZhangBiao
|
e7bc8b0aff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-17 00:09:17 +08:00 |
ZhangBiao
|
44f6f55d19
|
月卡增加动效
|
2020-09-17 00:09:06 +08:00 |
ZhangBiao
|
72601bff4f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 23:30:29 +08:00 |
ZhangBiao
|
6aebe6f49e
|
周月卡 点将台动效添加
|
2020-09-16 23:30:21 +08:00 |
zhangqiang
|
444fac23e8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-14 18:19:34 +08:00 |
zhangqiang
|
29ee4bf51e
|
注释公会副本刷新 修改音效
|
2020-09-14 18:19:26 +08:00 |
wangzhenxing
|
72536420dc
|
竞技场类型胜利条件修改
|
2020-09-14 16:46:56 +09:00 |
jiaoyangna
|
93dbd1648a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-14 15:31:54 +08:00 |
jiaoyangna
|
9846aebcf2
|
图鉴2460适配修改,【十绝阵】开启后没有显示主城入口,十绝阵活动结束后吗,入口显示0000不关闭,【青龙秘宝】活动描述和背景重叠
|
2020-09-14 15:31:33 +08:00 |
zhangqiang
|
fafbaa3617
|
音效
|
2020-09-14 15:11:07 +08:00 |
wangzhenxing
|
a85d909545
|
137 138被动效果修改
|
2020-09-14 16:03:54 +09:00 |
zhangqiang
|
1933a9b7ae
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-14 14:50:25 +08:00 |
zhangqiang
|
c985f4d874
|
跳转公会
|
2020-09-14 14:50:18 +08:00 |
ZhangBiao
|
2d9643c127
|
点击万象境后 点击切换账号卡死问题修复
|
2020-09-14 14:39:24 +08:00 |
ZhangBiao
|
e4ca9c100c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-14 14:24:01 +08:00 |
ZhangBiao
|
3594501654
|
大闹天宫 重置时把玩家踢出天宫密保 、天宫秘宝刷新bug修复,
|
2020-09-14 14:23:47 +08:00 |
zhangqiang
|
b3898fe07a
|
音效修改 加 公会副本接不可扫荡推送
|
2020-09-14 13:54:45 +08:00 |
gaoxin
|
cbb0a8462c
|
修改透传参数consumerId 为 角色id#商品id 修复sdk支付基金不刷新的问题,
|
2020-09-14 11:28:54 +08:00 |
gaoxin
|
62635bf604
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-12 19:24:53 +08:00 |
gaoxin
|
ab9e397ee2
|
添加用于定位商品充值成功后无法刷新界面问题的log
|
2020-09-12 19:24:49 +08:00 |
jiaoyangna
|
48f4fb5913
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-12 15:31:40 +08:00 |
jiaoyangna
|
6a47476673
|
公会副本 添加动画
|
2020-09-12 15:24:20 +08:00 |
gaoxin
|
2d44877d6f
|
尝试修复战斗中重连偶现关卡数据丢失的问题
|
2020-09-11 21:09:14 +08:00 |
wangzhenxing
|
28655e9732
|
秒杀效果修改
|
2020-09-11 18:57:51 +09:00 |
wangzhenxing
|
e80d4c7e6a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 18:07:27 +09:00 |
wangxiaolong
|
843762b810
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 18:02:27 +08:00 |
wangxiaolong
|
d21481514c
|
添加网络层log输出
|
2020-09-11 18:02:11 +08:00 |
wangzhenxing
|
70697ee6df
|
好友切磋回合结束按照总伤害值和治疗值判断输赢
|
2020-09-11 18:00:53 +09:00 |
wangzhenxing
|
3b83d4224e
|
boss免疫斩杀技能或生命百分比技能
|
2020-09-11 17:44:39 +09:00 |
ZhangBiao
|
1707762433
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
|
2020-09-11 12:03:42 +08:00 |
ZhangBiao
|
846724a9a0
|
开服福利层级修改
|
2020-09-11 12:02:23 +08:00 |
jiaoyangna
|
b0280552a1
|
chichafengyun icon 提交,开服福利添加动画
|
2020-09-11 11:47:55 +08:00 |
jiaoyangna
|
c25de2c1aa
|
森罗幻境动画删除
|
2020-09-11 11:09:58 +08:00 |
jiaoyangna
|
acb66b113d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 10:21:15 +08:00 |
jiaoyangna
|
dc7fe39497
|
活动记录值修改
|
2020-09-11 10:21:01 +08:00 |
gaoxin
|
c3fc01d249
|
回滚网络连接修改,废物操作
|
2020-09-10 19:35:58 +08:00 |
jiaoyangna
|
8b8e390a8a
|
邮件添加动画
|
2020-09-10 18:40:22 +08:00 |
ZhangBiao
|
c1ce67f7c3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 18:25:46 +08:00 |
ZhangBiao
|
156e81ab7b
|
天宫秘宝到时间踢出去
|
2020-09-10 18:25:39 +08:00 |
gaoxin
|
41aa573c68
|
再次尝试修复同时连接两个socket的问题
|
2020-09-10 18:09:30 +08:00 |
zhangqiang
|
52c6a96dbb
|
天赋提示语
|
2020-09-10 17:41:25 +08:00 |
zhangqiang
|
1b3c626708
|
加音效
|
2020-09-10 17:08:09 +08:00 |
ZhangBiao
|
dd4c91a46c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 16:53:23 +08:00 |
ZhangBiao
|
ca65ebbe49
|
限时兑换添加到叱咤风云中
|
2020-09-10 16:53:06 +08:00 |
jiaoyangna
|
442daa6312
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 20:23:42 +08:00 |
jiaoyangna
|
c2f7b1e7ce
|
破阵诛仙提交
|
2020-09-10 20:23:35 +08:00 |
jiaoyangna
|
3d99e2a46c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 18:08:26 +08:00 |
jiaoyangna
|
89f937e9ac
|
破阵诛仙提交
|
2020-09-10 18:08:21 +08:00 |
zhangqiang
|
c27c237fac
|
音效
|
2020-09-10 16:30:52 +08:00 |
jiaoyangna
|
fa33af7eea
|
限时提交
|
2020-09-10 16:18:54 +08:00 |
zhangqiang
|
5e92ce5f73
|
部分音效加入
|
2020-09-10 15:54:06 +08:00 |
jiaoyangna
|
6eed7b719d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 15:37:34 +08:00 |
jiaoyangna
|
f2015e8c98
|
日常任务修改
|
2020-09-10 15:36:17 +08:00 |
jiaoyangna
|
2998453d49
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 15:28:24 +08:00 |
jiaoyangna
|
e492dc6813
|
破阵诛仙提交
|
2020-09-10 15:28:19 +08:00 |
jiaoyangna
|
24365446a2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 14:44:56 +08:00 |
jiaoyangna
|
a06e4abf56
|
乾坤宝盒修改提交
|
2020-09-10 14:44:51 +08:00 |
gaoxin
|
2bf4247d59
|
修复sdk无法登录
|
2020-09-10 14:25:30 +08:00 |
gaoxin
|
70a575cbb3
|
部分界面不再常驻内存
|
2020-09-10 14:25:02 +08:00 |
jiaoyangna
|
3e5e41b8ff
|
破阵诛仙提交
|
2020-09-10 13:40:07 +08:00 |
wangzhenxing
|
49f0c19cea
|
争霸赛胜负规则修改
|
2020-09-10 11:50:12 +09:00 |
gaoxin
|
bf9cdac6b7
|
修改注册打点事件,将部分静态数据放在注册之前
|
2020-09-09 20:17:40 +08:00 |
gaoxin
|
a8e9974854
|
修改充值接口报错
|
2020-09-09 19:45:40 +08:00 |
gaoxin
|
bdacc0c703
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 18:47:23 +08:00 |
gaoxin
|
64f382c54d
|
充值接口修改,sdk和本地走同一套接口
|
2020-09-09 18:47:17 +08:00 |
ZhangBiao
|
ac87815d64
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 17:25:33 +08:00 |
ZhangBiao
|
4af6f84f03
|
|
2020-09-09 17:25:27 +08:00 |
ZhangBiao
|
f927da56e1
|
十绝阵排名bug修复
|
2020-09-09 15:20:56 +08:00 |
gaoxin
|
b9481babee
|
部分界面音效添加
|
2020-09-09 13:59:22 +08:00 |
zhangqiang
|
4bcb51e164
|
添加寻宝排行榜 和 巅峰赛赛季更新修改
|
2020-09-09 11:20:29 +08:00 |
jiaoyangna
|
c68cec489a
|
修改破阵诛仙子活动开启的条件判断
|
2020-09-10 11:03:47 +08:00 |
jiaoyangna
|
18ec0b7b20
|
限时召唤提交
|
2020-09-10 10:55:29 +08:00 |
ZhangBiao
|
b209b5ae28
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:52:58 +08:00 |
ZhangBiao
|
462ad7b96b
|
主题活动界面适配调整
|
2020-09-09 10:52:50 +08:00 |
jiaoyangna
|
d84b25c7a6
|
限时召唤提交
|
2020-09-10 09:33:27 +08:00 |
zhangqiang
|
c87812cec5
|
打印
|
2020-09-09 10:41:42 +08:00 |
zhangqiang
|
6e04bd3404
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:37:02 +08:00 |
zhangqiang
|
bf541ed4b0
|
寻宝达人替换资源
|
2020-09-09 10:36:55 +08:00 |
gaoxin
|
0393da682c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:36:52 +08:00 |
gaoxin
|
b395ea2804
|
竞技场跳过30级后解锁
|
2020-09-08 20:16:14 +08:00 |
gaoxin
|
63f7759c7a
|
引导人物修改
|
2020-09-08 18:03:38 +08:00 |
jiaoyangna
|
70df47683a
|
限时召唤提交
|
2020-09-08 17:56:49 +08:00 |
ZhangBiao
|
d36bd93b2d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-08 17:33:56 +08:00 |
ZhangBiao
|
f56be71560
|
主题活动修改
|
2020-09-08 17:16:08 +08:00 |
jiaoyangna
|
fb9b646553
|
限时召唤提交
|
2020-09-08 16:57:19 +08:00 |
gaoxin
|
37316136f1
|
剧情添加转场效果
|
2020-09-08 15:31:38 +08:00 |
zhangqiang
|
f6abc4a22e
|
公会副本倒计时结束 加成buff 重置
|
2020-09-08 12:01:05 +08:00 |
gaoxin
|
b65581fe71
|
引导战斗添加
|
2020-09-08 11:58:34 +08:00 |
ZhangBiao
|
f451ac76f5
|
|
2020-09-08 10:56:23 +08:00 |
ZhangBiao
|
7a375b767c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-08 10:32:58 +08:00 |
ZhangBiao
|
c67d731374
|
天宫秘宝增加购买校验
|
2020-09-08 10:32:49 +08:00 |
jiaoyangna
|
53524225f9
|
动画添加提交
|
2020-09-08 10:09:21 +08:00 |
jiaoyangna
|
6ac2b5a5f9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-08 09:32:45 +08:00 |