gaoxin
|
2d44877d6f
|
尝试修复战斗中重连偶现关卡数据丢失的问题
|
2020-09-11 21:09:14 +08:00 |
wangzhenxing
|
28655e9732
|
秒杀效果修改
|
2020-09-11 18:57:51 +09:00 |
jiaoyangna
|
728042f1f9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 17:50:53 +08:00 |
jiaoyangna
|
68b1628c8c
|
破阵诛仙
|
2020-09-11 17:48:55 +08: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 |
gongjiawei
|
8f20874508
|
音频更新
|
2020-09-11 16:15:28 +08: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
|
8454ba4015
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 11:10:02 +08:00 |
jiaoyangna
|
c25de2c1aa
|
森罗幻境动画删除
|
2020-09-11 11:09:58 +08:00 |
ZhangBiao
|
ca7f382b7f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 11:04:12 +08:00 |
ZhangBiao
|
70c535e1d8
|
限时兑换 奖励错误修改
|
2020-09-11 11:04:04 +08:00 |
gaoxin
|
1a3970c1dc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 10:44:26 +08:00 |
gaoxin
|
7a62bd904a
|
修复资源路径导致ab包循环引用无法加载游戏的问题
|
2020-09-11 10:44:08 +08:00 |
wangxiaolong
|
eceda23f4f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-11 10:23:15 +08:00 |
wangxiaolong
|
f8527290ab
|
添加判空处理
|
2020-09-11 10:23:05 +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
|
52b7a2665e
|
通用资源位置移动
|
2020-09-10 21:30:48 +08:00 |
gaoxin
|
17f241564f
|
ios添加获取底部高度的接口
|
2020-09-10 20:20:19 +08:00 |
gaoxin
|
857e255001
|
特效资源位置移动
|
2020-09-10 20:16:54 +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
|
85a8d95d19
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 17:41:33 +08:00 |
zhangqiang
|
52c6a96dbb
|
天赋提示语
|
2020-09-10 17:41:25 +08:00 |
gaoxin
|
50a78b54ca
|
1080 * 1920 分辨率不再对背景进行放大处理
|
2020-09-10 17:27:33 +08:00 |
gaoxin
|
521e317377
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 17:26:58 +08:00 |
gaoxin
|
f532b9bfcd
|
修复热更界面进度数字显示错误的问题
|
2020-09-10 17:26:51 +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 |