ZhangBiao
|
bff0e3a1ee
|
|
2020-07-31 10:09:25 +08:00 |
ZhangBiao
|
18d94c1026
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-31 10:01:57 +08:00 |
ZhangBiao
|
a7d0f4e522
|
八日登陆 特效修改
|
2020-07-31 10:00:56 +08:00 |
jiaoyangna
|
6f5092140f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-31 09:47:31 +08:00 |
jiaoyangna
|
d3a71d96aa
|
upstar view material head frame error commit
|
2020-07-31 09:47:06 +08:00 |
gaoxin
|
ffb6850010
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-30 18:50:47 +08:00 |
gaoxin
|
e786a479f5
|
服务器维护时,不再请求连接服务器
|
2020-07-30 18:50:41 +08:00 |
gongjiawei
|
3d0c82e4b0
|
音频更新
|
2020-07-30 17:51:17 +08:00 |
jiaoyangna
|
df84dd8577
|
mubiaojaingli effect update
|
2020-07-30 17:01:33 +08:00 |
jiaoyangna
|
1b2a752871
|
effect update
|
2020-07-30 16:37:58 +08:00 |
jiaoyangna
|
b6578e618e
|
effect update
|
2020-07-30 16:27:17 +08:00 |
jiaoyangna
|
ca080676df
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-30 16:03:37 +08:00 |
zhangqiang
|
588d2152b2
|
抽卡主城红点修改
|
2020-08-15 23:46:17 +08:00 |
jiaoyangna
|
0146c814ee
|
effectprefab update
|
2020-07-30 16:03:30 +08:00 |
jiaoyangna
|
d00afc69cf
|
添加特效
|
2020-08-06 15:14:47 +08:00 |
jiaoyangna
|
34f5e28e3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-06 14:24:24 +08:00 |
jiaoyangna
|
180d7122be
|
cardelay update
|
2020-08-06 14:23:05 +08:00 |
jiaoyangna
|
a1e08138d0
|
expedition head frame update
|
2020-08-06 13:55:35 +08:00 |
zhangqiang
|
f3e4b9f951
|
向后端发送主线战力变化 修改
|
2020-08-15 20:10:47 +08:00 |
zhangqiang
|
ce7c70820b
|
界面适配 跳转竞技场进攻阵容检测
|
2020-08-15 19:02:20 +08:00 |
gaoxin
|
9ab747a189
|
屏幕适配修改
|
2020-07-30 15:49:20 +08:00 |
zhangqiang
|
1ac12b1721
|
妖精单抽提示数量错误修改
|
2020-08-15 23:23:38 +08:00 |
szxhzz
|
e6468cd003
|
音频更新
|
2020-07-30 15:18:59 +08:00 |
gaoxin
|
1379fe1f0e
|
部分log删除
|
2020-07-30 14:13:20 +08:00 |
gaoxin
|
58728fa555
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-30 14:01:00 +08:00 |
gaoxin
|
c5f6b68906
|
rendertexture优化修改
|
2020-07-30 14:00:55 +08:00 |
gaoxin
|
19a2229fb8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-30 11:01:59 +08:00 |
gaoxin
|
e79d5ce4db
|
删除bugl配置
|
2020-07-30 11:01:41 +08:00 |
gaoxin
|
88fff64e80
|
修改短音效的播放方式
|
2020-07-30 10:57:46 +08:00 |
gaoxin
|
83999b75d5
|
战斗内添加日志上报功能
|
2020-07-30 10:57:29 +08:00 |
jiaoyangna
|
c328d4683c
|
特效添加提交
|
2020-07-30 10:08:58 +08:00 |
jiaoyangna
|
3f414f3d83
|
森罗编队提交
|
2020-07-29 21:08:41 +08:00 |
ZhangBiao
|
ee4ecf49c2
|
森罗环境 炸弹 终于完了
|
2020-07-29 20:18:19 +08:00 |
ZhangBiao
|
f806272897
|
GM
|
2020-07-29 19:35:29 +08:00 |
ZhangBiao
|
e852022166
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 18:36:45 +08:00 |
ZhangBiao
|
971622a4c5
|
限时兑换 文字修改
|
2020-07-29 18:36:36 +08:00 |
jiaoyangna
|
b54534db2f
|
chechihongdian update
|
2020-07-29 18:27:07 +08:00 |
jiaoyangna
|
47b7beaa08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 18:16:30 +08:00 |
jiaoyangna
|
c78cebde62
|
hongdianjiance tijao
|
2020-07-29 18:16:11 +08:00 |
JieLing
|
dadf5e2fe9
|
音效播放时机放在特效之前
|
2020-07-29 18:11:25 +08:00 |
gaoxin
|
2e5b87250b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 18:05:45 +08:00 |
gaoxin
|
d9a26568e4
|
添加战斗日志上报功能
|
2020-07-29 18:05:40 +08:00 |
jiaoyangna
|
66bfd4f4c9
|
车迟提交
|
2020-07-29 17:53:39 +08:00 |
jiaoyangna
|
b9084626eb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 17:51:40 +08:00 |
jiaoyangna
|
b2af34a2b3
|
副本红点提交
|
2020-07-29 17:50:15 +08:00 |
altair
|
5af034b02d
|
修改技能特效
|
2020-07-29 17:43:54 +08:00 |
gongjiawei
|
73301996e7
|
音频更新
|
2020-07-29 16:55:10 +08:00 |
ZhangBiao
|
e334375798
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 16:28:06 +08:00 |
ZhangBiao
|
72fef2124a
|
|
2020-07-29 16:27:56 +08:00 |
zhangqiang
|
b2a54634d2
|
适配调整 巅峰赛入口
|
2020-08-15 00:08:25 +08:00 |
ZhangBiao
|
59d03efa95
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 16:14:08 +08:00 |
ZhangBiao
|
4ab1e8c02d
|
点将台 汇聚箱 充值提示 关闭
|
2020-07-29 16:12:17 +08:00 |
szxhzz
|
200d2ca70c
|
删除多余音频
|
2020-07-29 15:56:08 +08:00 |
gongjiawei
|
6c13631569
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 15:49:01 +08:00 |
gongjiawei
|
e34274546f
|
音频更新
|
2020-07-29 15:48:28 +08:00 |
gaoxin
|
ce6c8c7871
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 15:44:47 +08:00 |
gaoxin
|
47beef7399
|
尝试修改抽卡报错
|
2020-07-29 15:43:42 +08:00 |
Genkins
|
88fd5161f8
|
提交优化工具
|
2020-07-29 15:15:30 +08:00 |
Genkins
|
2fed82af0d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 15:07:34 +08:00 |
Genkins
|
98ce0d920e
|
提交优化工具
|
2020-07-29 15:06:59 +08:00 |
ZhangBiao
|
d593bab16b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 14:37:22 +08:00 |
zhangqiang
|
74b9cc5c55
|
成员红点检测 巅峰战编队入口显示修复
|
2020-08-11 00:08:56 +08:00 |
ZhangBiao
|
c03e9336bc
|
"info" exception 修复
|
2020-07-29 14:37:12 +08:00 |
wangzhenxing
|
a2635081af
|
规避不灭效果修改
|
2020-07-29 13:41:15 +09:00 |
gaoxin
|
0c8a066142
|
普通攻击命中特效资源修改
|
2020-07-29 11:43:20 +08:00 |
gaoxin
|
b8f7c9789d
|
删除无用rendertexture资源
|
2020-07-29 11:42:21 +08:00 |
gaoxin
|
8261fe72a4
|
尝试修改第一次引导战斗会进入解锁章节界面的问题
|
2020-07-29 11:40:15 +08:00 |
gaoxin
|
f058668af6
|
修复红点id重复,导致聊天红点显示错误的问题
|
2020-07-29 11:39:52 +08:00 |
gongjiawei
|
a0957c03ad
|
音频更新
|
2020-07-29 10:50:18 +08:00 |
ZhangBiao
|
80d9c0b3a7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 02:32:17 +08:00 |
ZhangBiao
|
2731d973fb
|
删除跳过按钮的首充提示
|
2020-07-29 02:32:07 +08:00 |
gaoxin
|
829a102c73
|
关闭音频
|
2020-07-29 00:32:53 +08:00 |
gaoxin
|
650f872a0c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 00:04:56 +08:00 |
gaoxin
|
2980205399
|
修复假战斗报错的问题
|
2020-07-29 00:02:19 +08:00 |
ZhangBiao
|
7e917243e8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 23:25:53 +08:00 |
ZhangBiao
|
4f14ee8599
|
商店金币位数调整
|
2020-07-28 23:25:43 +08:00 |
jiaoyangna
|
28ad4fb613
|
update kuang
|
2020-07-28 23:14:02 +08:00 |
jiaoyangna
|
48f57d05f1
|
headframe update
|
2020-07-28 23:07:26 +08:00 |
ZhangBiao
|
d2bacc77ca
|
bug修复
|
2020-07-28 22:41:27 +08:00 |
jiaoyangna
|
a37402d40f
|
cardelay update
|
2020-07-28 22:33:38 +08:00 |
jiaoyangna
|
36070bc0c0
|
cardelaycarbon update
|
2020-07-28 22:25:51 +08:00 |
ZhangBiao
|
97b7118e11
|
|
2020-07-28 22:05:24 +08:00 |
ZhangBiao
|
8639065f06
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 22:00:25 +08:00 |
zhangqiang
|
02f92f749f
|
bug
|
2020-08-04 23:43:14 +08:00 |
ZhangBiao
|
dea2d14d3f
|
乾坤宝盒时间修复
|
2020-07-28 22:00:11 +08:00 |
ZhangBiao
|
fb5d81a7a4
|
bug修复
|
2020-07-28 21:18:40 +08:00 |
jiaoyangna
|
0a73f284ef
|
carbon detail update
|
2020-07-28 20:58:28 +08:00 |
jiaoyangna
|
5d70187da8
|
副本修改提交
|
2020-07-28 20:51:28 +08:00 |
ZhangBiao
|
ecfe1f5e33
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 20:14:40 +08:00 |
ZhangBiao
|
8c7b24ad9a
|
bug修复
|
2020-07-28 20:13:09 +08:00 |
jiaoyangna
|
5df246c45b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 20:09:46 +08:00 |
jiaoyangna
|
43ee7dd577
|
限时召唤提交
|
2020-07-28 20:09:41 +08:00 |
gongjiawei
|
31826a5d08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 19:45:06 +08:00 |
gongjiawei
|
b9c15c6c23
|
音频更新
|
2020-07-28 19:44:57 +08:00 |
szxhzz
|
96fe229ade
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 19:44:15 +08:00 |
szxhzz
|
3814874c3f
|
音频更新
|
2020-07-28 19:43:35 +08:00 |
gongjiawei
|
b9f6ef86e7
|
音频更新
|
2020-07-28 19:39:27 +08:00 |
gongjiawei
|
efbfff0b3e
|
音頻跟新
|
2020-07-28 19:35:51 +08:00 |
szxhzz
|
c879b10480
|
音频更新
|
2020-07-28 19:31:04 +08:00 |
jiaoyangna
|
a3298ae117
|
星星预设提交
|
2020-07-28 19:21:16 +08:00 |
jiaoyangna
|
8a2a443168
|
星星提交
|
2020-07-28 19:18:45 +08:00 |
jiaoyangna
|
bf77931b88
|
边框修改提交
|
2020-07-28 18:38:19 +08:00 |
altair
|
a6b232757c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 18:22:19 +08:00 |
altair
|
2e046d4d74
|
修改特效
|
2020-07-28 18:22:11 +08:00 |
gaoxin
|
e3e317fb5c
|
音频压缩、加载格式修改
|
2020-07-28 18:01:53 +08:00 |
Genkins
|
7649e67049
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:58:39 +08:00 |
Genkins
|
65252cb36d
|
添加图片优化工具
|
2020-07-28 17:57:02 +08:00 |
zhangqiang
|
acba506782
|
寻宝添加6星显示
|
2020-07-31 18:40:22 +08:00 |
gaoxin
|
0922b8f587
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:31:24 +08:00 |
gaoxin
|
a603520fdb
|
Merge branch '接入SDK' into master_develop
|
2020-07-28 17:30:59 +08:00 |
gaoxin
|
c9b4e71ab7
|
新aar资源替换
|
2020-07-28 17:30:06 +08:00 |
ZhangBiao
|
88effd78f1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:26:50 +08:00 |
ZhangBiao
|
6c316bf7de
|
|
2020-07-28 17:25:50 +08:00 |
gaoxin
|
2df9b068b9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:24:15 +08:00 |
gaoxin
|
fbff3d2a2a
|
删除音频文件导入时自动设置文件格式的问题
|
2020-07-28 17:20:25 +08:00 |
gaoxin
|
72921a8f51
|
修复行动时遭受异常状态死亡时会继续释放技能的问题
|
2020-07-28 17:19:57 +08:00 |
ZhangBiao
|
1f474fd636
|
|
2020-07-28 17:17:55 +08:00 |
ZhangBiao
|
771826da9c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:01:58 +08:00 |
ZhangBiao
|
018adbe85d
|
天宫秘宝入口关闭,修改乾坤宝盒魂印弹窗
|
2020-07-28 17:01:48 +08:00 |
gaoxin
|
5d6586a9a5
|
部分界面适配修改
|
2020-07-28 17:00:19 +08:00 |
jiaoyangna
|
25d535fa4c
|
关闭特效
|
2020-07-28 16:57:12 +08:00 |
jiaoyangna
|
60bf046b81
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 16:54:43 +08:00 |
jiaoyangna
|
38a69a4017
|
编队添加特效
|
2020-07-28 16:54:38 +08:00 |
ZhangBiao
|
e2a8af9028
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 16:45:38 +08:00 |
zhangqiang
|
2a87d43fd0
|
bug
|
2020-07-31 17:36:06 +08:00 |
ZhangBiao
|
ddfbb25e2e
|
森罗bug修复
|
2020-07-28 16:45:28 +08:00 |
gaoxin
|
5f6783fc13
|
新通用被击特效提交
|
2020-07-28 16:30:03 +08:00 |
gaoxin
|
e7e3de1674
|
引导打点不再传递日期
|
2020-07-28 16:12:29 +08:00 |
gaoxin
|
be57d5d44a
|
删除错误的spine
|
2020-07-28 16:11:04 +08:00 |
ZhangBiao
|
b4b24e62be
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:57:51 +08:00 |
ZhangBiao
|
a732396286
|
修复【乾坤宝】抽取获得的预览,可以操作装备出售
|
2020-07-28 15:57:36 +08:00 |
zhangqiang
|
a7d6db223a
|
war power change
|
2020-07-31 16:37:14 +08:00 |
ZhangBiao
|
1868a14b08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:24:21 +08:00 |
ZhangBiao
|
52c34aa2a3
|
花费妖晶抽卡提示优化
|
2020-07-28 15:24:11 +08:00 |
jiaoyangna
|
119c4e4204
|
漏提
|
2020-07-28 15:16:04 +08:00 |
jiaoyangna
|
d5b15a17ee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2020-07-28 15:08:24 +08:00 |
zhangqiang
|
565d0392fc
|
背景颜色根据星级变化
|
2020-07-31 15:40:43 +08:00 |
zhangqiang
|
b63e9b7e81
|
英雄添加按战力排序
|
2020-07-31 14:45:32 +08:00 |
jiaoyangna
|
99f9e7169e
|
添加特效
|
2020-07-28 15:06:47 +08:00 |
ZhangBiao
|
146197b320
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 10:42:38 +08:00 |
ZhangBiao
|
ee79439f39
|
万象境 bug修复
|
2020-07-28 10:42:29 +08:00 |
gaoxin
|
48a39d2fae
|
游戏logo替换
|
2020-07-28 10:40:02 +08:00 |
szxhzz
|
2175be7bfc
|
配音更新
|
2020-07-28 10:25:46 +08:00 |
ZhangBiao
|
f26718899e
|
bug修复
|
2020-07-28 10:24:52 +08:00 |
ZhangBiao
|
cec1f145b6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 09:48:26 +08:00 |
ZhangBiao
|
48ac527f1a
|
限时召唤 乾坤宝盒 页面整合
|
2020-07-28 09:48:02 +08:00 |
altair
|
440a629582
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 21:04:59 +08:00 |
altair
|
aff5c002a9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# data_execl/base_data/CombatControl.xlsx
|
2020-07-27 21:04:51 +08:00 |
jiaoyangna
|
b6c2b22a3d
|
【日常副本优化】每个日常副本标题下方增加副本描述文字
|
2020-07-27 20:34:59 +08:00 |
jiaoyangna
|
18c6ad6555
|
carbon prefab commit
|
2020-07-27 20:08:23 +08:00 |
jiaoyangna
|
e1ebc7c169
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 19:48:16 +08:00 |
jiaoyangna
|
54b3aad5e9
|
【副本优化】副本入口处增加文字提示
|
2020-07-27 19:48:05 +08:00 |
ZhangBiao
|
6cff95eca9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 19:42:46 +08:00 |
ZhangBiao
|
66d7cc5ccc
|
|
2020-07-27 19:42:20 +08:00 |
szxhzz
|
8d6448a2bd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 18:17:54 +08:00 |
zhangqiang
|
5a32cb4eb6
|
xie yi change
|
2020-07-29 01:24:21 +08:00 |
szxhzz
|
c02ccf8545
|
通用点击音效更新
|
2020-07-27 18:16:58 +08:00 |
jiaoyangna
|
0520ccb297
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 18:01:16 +08:00 |
jiaoyangna
|
40345b0ab7
|
十连抽提交
|
2020-07-27 18:00:45 +08:00 |
zhangqiang
|
cf1bd66f22
|
预设微调
|
2020-07-29 00:50:13 +08:00 |
JieLing
|
64ff767121
|
Merge branch '接入SDK' into master_develop
|
2020-07-27 17:53:54 +08:00 |
JieLing
|
437d241532
|
猕猴桃sdk文件替换
|
2020-07-27 17:49:07 +08:00 |
JieLing
|
67914ba7dd
|
引导打点数据类型修改
|
2020-07-27 17:48:33 +08:00 |
ZhangBiao
|
cbd607b479
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 17:22:23 +08:00 |
zhangqiang
|
ac67088a90
|
背包合成不弹英雄展示
|
2020-07-29 00:11:36 +08:00 |
ZhangBiao
|
61aadd2cb8
|
跳过按钮lock大小调整
|
2020-07-27 17:21:16 +08:00 |
jiaoyangna
|
9abf33d1db
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 16:49:24 +08:00 |
zhangqiang
|
36e18b7519
|
背包碎片排序 限时兑换调整预设
|
2020-07-28 23:40:36 +08:00 |
jiaoyangna
|
1b9f8478cc
|
role gps star update
|
2020-07-27 16:49:13 +08:00 |
JieLing
|
f5d0cc001c
|
添加打点数据类型
|
2020-07-27 16:41:38 +08:00 |
JieLing
|
9465fbd6e4
|
删除bug初始化的位置
|
2020-07-27 15:31:11 +08:00 |
gaoxin
|
ea7ee1141b
|
修复跳转充值界面后黑屏卡死的问题
|
2020-07-27 15:25:42 +08:00 |
gaoxin
|
48715b151a
|
sdk修改
|
2020-07-27 14:42:25 +08:00 |
wangzhenxing
|
19a069994b
|
修改杨戬锤不死金翅大鹏一直锤的bug
|
2020-07-27 15:19:17 +09:00 |
gongjiawei
|
327cda1f37
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 14:21:24 +08:00 |
gongjiawei
|
ffccc6d77a
|
音频更新
|
2020-07-27 14:20:50 +08:00 |
jiaoyangna
|
e71f82795a
|
编队界面修改提交
|
2020-07-27 14:13:31 +08:00 |
ZhangBiao
|
a53b1edd7d
|
元素共鸣 “已激活”字样删除
|
2020-07-27 11:00:08 +08:00 |
ZhangBiao
|
e3eb566008
|
乾坤宝盒奖励概率错误修改
|
2020-07-27 09:59:50 +08:00 |
gaoxin
|
1af2ee96f4
|
修复打点静态数据保存不完全的问题
|
2020-07-26 18:37:31 +08:00 |
gaoxin
|
6bfa7d318b
|
注释代码
|
2020-07-26 17:28:44 +08:00 |
gaoxin
|
eff6ee6d08
|
临时关闭星级成长礼显示
|
2020-07-26 16:44:31 +08:00 |
JieLing
|
0670160fd3
|
修复森罗幻境入口白片问题
|
2020-07-26 16:35:38 +08:00 |
JieLing
|
cabc456d73
|
修复tapDB初始化参数错误的问题
|
2020-07-26 16:35:31 +08:00 |
gaoxin
|
3cd56b6ccc
|
修复森罗幻境底部人物星级显示错误的问题
|
2020-07-26 16:33:27 +08:00 |
gaoxin
|
b323148076
|
尝试修改app安装事件在创建角色事件之后触发的问题
|
2020-07-26 11:14:29 +08:00 |
gaoxin
|
b0503f795c
|
修复技能名称音效没有声音的问题
|
2020-07-26 11:13:25 +08:00 |
jiaoyangna
|
48c209b4aa
|
formation commit
|
2020-07-25 22:58:55 +08:00 |
jiaoyangna
|
b1bf2876cb
|
10 star update
|
2020-07-25 21:57:46 +08:00 |
zhangqiang
|
7f9c4f6862
|
提交
|
2020-09-13 22:25:50 +08:00 |
jiaoyangna
|
1802487345
|
itemview update
|
2020-07-25 20:56:23 +08:00 |
altair
|
e98d50c3db
|
增加图片文件
|
2020-07-25 20:51:23 +08:00 |
gaoxin
|
b0002cf781
|
语言文字替换
|
2020-07-25 20:42:11 +08:00 |
gaoxin
|
a8abedf426
|
本地服务器列表请求打印添加
|
2020-07-25 20:37:06 +08:00 |
jiaoyangna
|
24f9860235
|
close supreme
|
2020-07-25 20:35:32 +08:00 |
jiaoyangna
|
f4dc657551
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 20:28:46 +08:00 |
zhangqiang
|
bedfcdb4f6
|
车迟怪物显示
|
2020-09-13 21:56:49 +08:00 |
skuld
|
fcc1424cd5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 22:37:33 +08:00 |
skuld
|
7731aa45b8
|
修改猎妖之路为大闹天宫
|
2020-07-28 22:36:17 +08:00 |
jiaoyangna
|
46f091f09c
|
头像框修改提交
|
2020-07-25 20:28:41 +08:00 |
jiaoyangna
|
0ec835f540
|
获取头像框通用方法修改
|
2020-07-25 20:04:02 +08:00 |
jiaoyangna
|
48ff5b8b28
|
头像框通用方法修改
|
2020-07-25 20:02:24 +08:00 |
jiaoyangna
|
d8fa2b9459
|
头像背景修改
|
2020-07-25 19:59:43 +08:00 |
gaoxin
|
7002d45fdc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 19:35:03 +08:00 |
gaoxin
|
c56a54665c
|
添加服务器版本号,用于切换提审服和正式服
|
2020-07-25 19:34:52 +08:00 |
jiaoyangna
|
57617faa49
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 19:32:02 +08:00 |
zhangqiang
|
3b11c5737a
|
空判断
|
2020-09-12 14:42:55 +08:00 |
jiaoyangna
|
f511cf3380
|
车迟斗法挑战提交
|
2020-07-25 19:31:55 +08:00 |
gaoxin
|
7d9a555151
|
修复被动225报错
|
2020-07-25 19:24:29 +08:00 |
gaoxin
|
55fa5dda67
|
特效transform转rectTransform
|
2020-07-25 18:53:26 +08:00 |
jiaoyangna
|
470a89d6f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:35:54 +08:00 |
jiaoyangna
|
7c92ddc60a
|
副本置灰修改提交
|
2020-07-25 18:35:05 +08:00 |
gaoxin
|
98ef2bc8be
|
修复获取访客id报错
|
2020-07-25 18:31:06 +08:00 |
zhangqiang
|
789dc39efa
|
xiugaiyushe
|
2020-09-11 23:36:19 +08:00 |
gaoxin
|
2c2734ec2a
|
修复引导报错,修复本地测试时打点数据错误的问题
|
2020-07-25 18:10:05 +08:00 |
zhangqiang
|
a077692c0f
|
关卡编队修改
|
2020-09-11 23:07:45 +08:00 |
jiaoyangna
|
58702c0025
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 17:24:25 +08:00 |
jiaoyangna
|
e4525199d8
|
开启乾坤宝囊和限时召唤
|
2020-07-25 17:24:19 +08:00 |
gaoxin
|
28a74e529b
|
打点事件修改
|
2020-07-25 17:17:34 +08:00 |
gaoxin
|
0cca48270d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 17:09:06 +08:00 |
gaoxin
|
2947a10e03
|
引导打点添加,打点account字段改为字符串类型
|
2020-07-25 17:08:56 +08:00 |
jiaoyangna
|
8bc87ca492
|
按钮位置不对提交
|
2020-07-25 17:08:20 +08:00 |
zhangqiang
|
a24c1e2016
|
暂时屏蔽加一种道具
|
2020-09-11 21:53:12 +08:00 |
gaoxin
|
3ef98155b5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 16:25:23 +08:00 |
zhangqiang
|
a65257a740
|
剑影仙踪去掉拍脸
|
2020-09-11 21:37:17 +08:00 |
gaoxin
|
65756cbe59
|
Merge branch 'master_local_test' into master_develop
# Conflicts:
# Assets/Effect.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_02.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_03.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ddtz_00049_001_01.prefab.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
# Assets/ManagedResources/~Lua/Modules/MapChoose.meta
|
2020-07-25 16:24:48 +08:00 |
JieLing
|
543a4ca080
|
修复提交数据报错,内网测试0.16.2
|
2020-07-25 16:23:04 +08:00 |
gaoxin
|
528cd49109
|
Merge branch 'master_local_test' into master_develop
|
2020-07-25 16:21:30 +08:00 |
gaoxin
|
2b7eb6bf2a
|
Merge branch '英雄技能特效添加' into master_develop
# Conflicts:
# Assets/Effect/Prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_01.prefab.meta
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
|
2020-07-25 16:13:55 +08:00 |
gaoxin
|
99315ac3c6
|
首充引导关闭
|
2020-07-25 16:05:27 +08:00 |
gaoxin
|
761745dc63
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 16:02:50 +08:00 |
zhangqiang
|
fe01796ded
|
修改
|
2020-09-11 21:10:39 +08:00 |
gaoxin
|
0b62abdb72
|
修复左右黑边的问题
|
2020-07-25 16:02:38 +08:00 |
jiaoyangna
|
50e50475be
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 15:46:48 +08:00 |
gaoxin
|
e6b0cbcf3e
|
无用meta文件删除
|
2020-07-25 15:31:11 +08:00 |
gaoxin
|
7c47d7c6a4
|
攻击音效提前0.3秒
|
2020-07-25 15:30:33 +08:00 |
zhangqiang
|
1845d662ab
|
巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称
|
2020-09-07 21:15:40 +08:00 |
JieLing
|
6ac8b914d5
|
修复登录报错
|
2020-07-25 15:23:10 +08:00 |
jiaoyangna
|
6742056a93
|
冲突解决提交
|
2020-07-25 15:18:07 +08:00 |
JieLing
|
6807c6c1a6
|
meta文件提交
|
2020-07-25 15:15:16 +08:00 |
JieLing
|
cd43d2417f
|
内网测试 0.16.1
|
2020-07-25 15:13:59 +08:00 |
JieLing
|
2164aacc49
|
内网包配置修改
|
2020-07-25 14:52:41 +08:00 |
JieLing
|
89169b7291
|
资源文件名重复
|
2020-07-25 14:45:27 +08:00 |
JieLing
|
5896ecee63
|
Merge branch 'master_develop' into master_test
# Conflicts:
# Assets/LuaFramework/Scenes/Logo.unity
|
2020-07-25 14:31:52 +08:00 |
jiaoyangna
|
a688050060
|
修改星星提交
|
2020-07-25 14:21:33 +08:00 |
zhangqiang
|
f19188797f
|
英雄背景替换修改出发位置
|
2020-08-25 15:11:32 +08:00 |
zhangqiang
|
4117095996
|
一键上阵优化
|
2020-08-24 23:38:17 +08:00 |
jiaoyangna
|
5f556b7b5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
|
2020-07-25 13:22:33 +08:00 |
jiaoyangna
|
0c2239bd11
|
编队修改提交
|
2020-07-25 13:21:30 +08:00 |
jiaoyangna
|
caadda04e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
|
2020-07-24 20:04:44 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
ZhangBiao
|
ae1d8b4e97
|
|
2020-07-24 18:49:17 +08:00 |
zhangqiang
|
a6744aaa90
|
替换英雄详情背景
|
2020-08-24 22:03:28 +08:00 |
zhangqiang
|
a11919fbd9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 21:46:33 +08:00 |
zhangqiang
|
abfde3e8a9
|
巅峰战bug and 使用按钮需求
|
2020-08-24 21:46:19 +08:00 |
ZhangBiao
|
4945f99452
|
--(24暂时关闭)
|
2020-07-24 18:30:26 +08:00 |
ZhangBiao
|
f1755d0efa
|
--(24暂时关闭)
|
2020-07-24 16:52:36 +08:00 |
ZhangBiao
|
d398804a83
|
--(24暂时关闭)
|
2020-07-24 16:38:04 +08:00 |
ZhangBiao
|
7fb91910fd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 15:22:30 +08:00 |
ZhangBiao
|
b3ddd8fc96
|
|
2020-07-24 15:22:17 +08:00 |
zhangqiang
|
6238892d99
|
巅峰赛刷新调位置 赛程增加-1
|
2020-08-05 21:28:16 +08:00 |
zhangqiang
|
4d0b53adf9
|
巅峰赛货币显示
|
2020-08-05 21:03:36 +08:00 |
ZhangBiao
|
0ad52a3855
|
活动暂时关闭
|
2020-07-24 13:39:02 +08:00 |
ZhangBiao
|
f27300721a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 12:14:52 +08:00 |
ZhangBiao
|
1f5440c2e6
|
bug修复
|
2020-07-24 12:11:00 +08:00 |
zhangqiang
|
42959d0257
|
编队bug
|
2020-07-24 11:05:40 +08:00 |
jiaoyangna
|
667b3e0bf5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:32:45 +08:00 |
jiaoyangna
|
15976637f4
|
log提交
|
2020-07-24 10:32:27 +08:00 |
ZhangBiao
|
5edb6c9234
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:30:56 +08:00 |
ZhangBiao
|
f7424e83ca
|
元素共鸣
|
2020-07-24 10:30:33 +08:00 |
JieLing
|
ac344a2d99
|
修复tapdb用户id
|
2020-07-24 10:22:20 +08:00 |
zhangqiang
|
dbb563fbe5
|
播放第三场战斗动画修改
|
2020-07-24 10:01:48 +08:00 |
zhangqiang
|
485c81da9f
|
禁止上下阵提示文字
|
2020-07-24 09:36:19 +08:00 |
JieLing
|
2899bb433c
|
猕猴桃 测试服 0.1.1
|
2020-07-23 21:32:12 +08:00 |
zhangqiang
|
3fa23c25ea
|
修改界面id
|
2020-07-23 21:29:40 +08:00 |
gaoxin
|
c8c06b9493
|
判断错误
|
2020-07-23 21:26:03 +08:00 |
zhangqiang
|
3588a17c00
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# data_execl/base_data/UIConfig.xlsx
|
2020-07-23 21:24:00 +08:00 |
zhangqiang
|
688662836a
|
修改
|
2020-07-23 21:18:46 +08:00 |
JieLing
|
7b2bc16abe
|
bugly添加
|
2020-07-23 21:10:35 +08:00 |
JieLing
|
291ab0ecf7
|
漏掉的文件
|
2020-07-23 20:46:51 +08:00 |
zhangqiang
|
6a855cf7a2
|
巅峰赛问题修改
|
2020-07-23 20:39:21 +08:00 |
gaoxin
|
95cbec95e0
|
添加包名获取,添加账号创建打点。
|
2020-07-23 20:04:25 +08:00 |
ZhangBiao
|
c268538c0e
|
共鸣资源替换
|
2020-07-23 19:46:54 +08:00 |
ZhangBiao
|
7b795f0daa
|
森罗bug
|
2020-07-23 19:05:43 +08:00 |
zhangqiang
|
94684153c3
|
回放三局两胜显示
|
2020-07-23 18:06:55 +08:00 |
gaoxin
|
f761bd5b9c
|
sdk代码文件替换
|
2020-07-23 17:45:23 +08:00 |
ZhangBiao
|
259daf6a92
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 17:42:46 +08:00 |
ZhangBiao
|
e0d156ad74
|
森罗英雄全部死亡战斗报错
|
2020-07-23 17:42:17 +08:00 |
gaoxin
|
3fc23499f9
|
获取包名方法添加
|
2020-07-23 17:28:01 +08:00 |
gaoxin
|
6f2a3c1c6c
|
新出包需求添加,sdk结构修改
|
2020-07-23 17:16:47 +08:00 |
jiaoyangna
|
5894babbf0
|
英雄献祭修改提交
|
2020-07-23 16:26:51 +08:00 |
ZhangBiao
|
4114a241dd
|
|
2020-07-23 16:02:11 +08:00 |
ZhangBiao
|
7fb5ac778f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:44:51 +08:00 |
ZhangBiao
|
9b290c1ed5
|
图片资源替换
|
2020-07-23 15:44:40 +08:00 |
jiaoyangna
|
4af617da49
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:43:23 +08:00 |
jiaoyangna
|
aefa2b0cac
|
添加一个万象境的入口列表
|
2020-07-23 15:42:42 +08:00 |
wangzhenxing
|
60b7e750a6
|
【ID1007274】
【技能】无敌盾应清除目标所有负面状态
|
2020-07-23 16:19:00 +09:00 |
jiaoyangna
|
578d81e12e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-07-23 16:07:43 +08:00 |
jiaoyangna
|
561c3299f2
|
.asset commit
|
2020-07-23 16:05:56 +08:00 |
jiaoyangna
|
2fd0311c3c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-07-23 16:02:06 +08:00 |