wangzhenxing
|
9a7b7c8eff
|
被动108 改为自身死亡后就不会反弹伤害
|
2020-08-21 15:59:34 +09:00 |
wangzhenxing
|
0f71f295d2
|
被动最佳技能添加类型判断,如果可以触发其他被动就赋成绝技类型,否是附加类型
|
2020-08-21 15:49:42 +09:00 |
liujiaqi
|
1c577e94fe
|
法宝新资源
|
2020-08-21 14:56:38 +08:00 |
ZhangBiao
|
54f285807b
|
代码调整
|
2020-08-21 14:42:36 +08:00 |
ZhangBiao
|
7ae97fdff0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 11:24:02 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
zhangqiang
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +08:00 |
ZhangBiao
|
aa551923b1
|
破阵诛仙 珍奇宝阁
|
2020-08-20 18:32:14 +08:00 |
wangzhenxing
|
dc77526a67
|
把死亡人数检测放到最后检测,防止有些有复活技能无法触发
|
2020-08-20 18:07:08 +09:00 |
jiaoyangna
|
948f47398c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 17:36:31 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
jiaoyangna
|
6c52db4ec6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 16:08:18 +08:00 |
jiaoyangna
|
2eaa10cdbc
|
添加红点
|
2020-08-20 16:08:12 +08:00 |
wangzhenxing
|
9aec289306
|
添加新被动242,243 技能概率追加技能,击杀追加技能
|
2020-08-20 16:54:03 +09:00 |
ZhangBiao
|
b650ba81e8
|
界面顺序调整
(cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5)
|
2020-08-20 16:48:30 +08:00 |
ZhangBiao
|
4f43a2513a
|
Revert ""
This reverts commit 6be5ebd2cd.
|
2020-08-20 15:09:40 +08:00 |
ZhangBiao
|
6be5ebd2cd
|
|
2020-08-20 15:08:22 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
ZhangBiao
|
17465d2f3d
|
|
2020-08-20 14:56:29 +08:00 |
ZhangBiao
|
e9b8083148
|
|
2020-08-20 14:43:48 +08:00 |
ZhangBiao
|
f93c57fd31
|
副本快结束啦!
|
2020-08-19 20:57:04 +08:00 |
jiaoyangna
|
d1a4bff97e
|
chengjiu update
|
2020-08-19 20:10:48 +08:00 |
jiaoyangna
|
785590bd4f
|
五星成长礼提交
|
2020-08-19 22:11:48 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
ZhangBiao
|
32eadd13ef
|
试炼
|
2020-08-19 17:18:38 +08:00 |
liujiaqi
|
87141ee852
|
新法宝资源
|
2020-08-19 14:23:59 +08:00 |
jiaoyangna
|
60095d336d
|
qinglongserect commit
|
2020-08-19 14:12:42 +08:00 |
jiaoyangna
|
f439a78b34
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-19 10:05:09 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
7e4b73dc27
|
两个副本,基本成型了
|
2020-08-18 21:03:55 +08:00 |
liujiaqi
|
911d3fabf9
|
新英雄资源及技能名称资源替换
|
2020-08-18 20:35:51 +08:00 |
zhangqiang
|
c6b0acb7d8
|
Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
|
2020-08-18 19:36:17 +08:00 |
zhangqiang
|
00f1060be7
|
公会副本提交初始界面
|
2020-08-18 19:33:31 +08:00 |
ZhangBiao
|
f18973cea9
|
极速达人修改
|
2020-08-18 19:17:20 +08:00 |
wangzhenxing
|
0e6c9ce414
|
阎罗王被动根据异常类型加伤修改
|
2020-08-18 20:07:00 +09:00 |
ZhangBiao
|
8f786147d3
|
|
2020-08-18 16:36:24 +08:00 |
gongjiawei
|
af6dcc4410
|
音频更新
|
2020-08-18 16:23:57 +08:00 |
ZhangBiao
|
448c5d3b17
|
无尽_新重做前的提交
|
2020-08-18 15:48:41 +08:00 |
jiaoyangna
|
e2b2517ad0
|
live2d commit
|
2020-08-18 15:42:21 +08:00 |
jiaoyangna
|
95593175ec
|
dailycarbonpanel update
|
2020-08-18 14:00:03 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +08:00 |
ZhangBiao
|
b0f0b654ec
|
无尽副本已经可以进去了
(cherry picked from commit a1737d6e7014963b19c97ccfb2d1c878d88bc295)
|
2020-08-18 10:48:52 +08:00 |
ZhangBiao
|
9f8b553626
|
试炼副本补日志
(cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492)
|
2020-08-18 10:46:33 +08:00 |
ZhangBiao
|
4ef8870c4d
|
试炼副本改到了一半
(cherry picked from commit 4e442c7614a669cee38e731edf627b2582b2547b)
|
2020-08-18 10:45:59 +08:00 |
ZhangBiao
|
e2589d5301
|
提交打出的协议
(cherry picked from commit fe559cc210441192ba638b19d43749de5207c99e)
|
2020-08-18 10:45:37 +08:00 |
jiaoyangna
|
a5209137f0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 10:34:27 +08:00 |
jiaoyangna
|
3e9fcb7e71
|
xuanyuan update
|
2020-08-18 10:33:19 +08:00 |
jiaoyangna
|
92447e21a8
|
列表优化提交
|
2020-08-18 10:22:24 +08:00 |
wangzhenxing
|
98eb034cfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 10:26:44 +09:00 |
wangzhenxing
|
d16361e4d1
|
纵排改为仇恨目标
|
2020-08-18 10:26:24 +09:00 |
wangzhenxing
|
46ec8ef4b4
|
吸血修改,由finalDamage 改为 damage
|
2020-08-17 19:15:04 +09:00 |
gongjiawei
|
5954f92915
|
音频更新
|
2020-08-17 18:33:05 +08:00 |
zhangqiang
|
c67951f5fb
|
公会副本资源提交
|
2020-08-17 16:19:25 +08:00 |
wangzhenxing
|
cd5f26e8af
|
完整显示多段伤害
|
2020-08-17 17:12:34 +09:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
jiaoyangna
|
7ff435c765
|
xuanyuan update
|
2020-08-17 15:48:40 +08:00 |
jiaoyangna
|
17524007d7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 15:18:03 +08:00 |
jiaoyangna
|
0210dc3109
|
conflict commit
|
2020-08-17 15:17:58 +08:00 |
ZhangBiao
|
77b3386efb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 11:57:01 +08:00 |
ZhangBiao
|
c2fdcb06bd
|
极速达人
|
2020-08-17 11:56:38 +08:00 |
zhangqiang
|
6df142b067
|
修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏
|
2020-08-17 11:39:41 +08:00 |
jl_ios
|
21ea44a475
|
导表工具完善
|
2020-08-15 16:42:55 +08:00 |
gaoxin
|
d256a6da7c
|
符号错误
|
2020-08-15 15:21:56 +08:00 |
gaoxin
|
dc1188b886
|
修复非Android和Ios版本会报错的问题
|
2020-08-15 15:20:02 +08:00 |
gaoxin
|
fcda2d9d1d
|
导表工具添加
|
2020-08-15 15:09:27 +08:00 |
jl_ios
|
7dbd376327
|
Merge branch '0功能/iOS-sdk' into master_develop
|
2020-08-15 11:45:59 +08:00 |
jl_ios
|
e5015da253
|
添加iossdk接口
|
2020-08-15 10:13:32 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +08:00 |
jiaoyangna
|
d97203bf0b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 21:05:30 +08:00 |
jiaoyangna
|
740eb7253d
|
xuanyuan commit
|
2020-08-14 20:41:07 +08:00 |
JieLing
|
66687a1ce4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 17:49:33 +08:00 |
jiaoyangna
|
481c818ffa
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 17:43:30 +08:00 |
jiaoyangna
|
84f82d488d
|
live2d commit
|
2020-08-14 17:43:24 +08:00 |
JieLing
|
7453825d63
|
Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
# Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
# Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
# Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
|
2020-08-14 17:41:21 +08:00 |
JieLing
|
5e9448dd24
|
资源提交,
|
2020-08-14 17:35:18 +08:00 |
JieLing
|
ad3ee94a75
|
资源压缩方式修改,苹果资源压缩方式添加,
|
2020-08-14 17:29:06 +08:00 |
jiaoyangna
|
0b157b6ee8
|
轩辕宝镜入口替换
|
2020-08-14 16:09:00 +08:00 |
wangzhenxing
|
78e2d45288
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 16:51:03 +09:00 |
liujiaqi
|
cda648c50a
|
新东华帝君通天教主123星大小卡牌
|
2020-08-14 16:45:09 +08:00 |
wangzhenxing
|
e139a43f65
|
屏蔽金翅大鹏不死效果
|
2020-08-14 16:50:32 +09:00 |
jiaoyangna
|
e88e7544c2
|
通关豪礼替换
|
2020-08-14 14:41:29 +08:00 |
jiaoyangna
|
4604df2d0b
|
修改轩辕副本立绘
|
2020-08-14 14:36:24 +08:00 |
jiaoyangna
|
40b9550c54
|
修改轩辕副本立绘提交
|
2020-08-14 14:35:48 +08:00 |
jiaoyangna
|
d27b4b165f
|
资源名重复修改提交
|
2020-08-14 14:29:06 +08:00 |
jiaoyangna
|
3834e1960e
|
图片导入
|
2020-08-14 14:17:38 +08:00 |
jiaoyangna
|
1f7b161087
|
五星成长礼修改提交
|
2020-08-14 13:32:55 +08:00 |
jiaoyangna
|
905d77b0c6
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 13:01:17 +08:00 |
jiaoyangna
|
c9c3cb2fa4
|
operatingmanager commit
|
2020-08-14 13:01:12 +08:00 |
jiaoyangna
|
4c8d556b31
|
动态立绘提交
|
2020-08-14 12:59:19 +08:00 |
jiaoyangna
|
b4acffd954
|
动态立绘提交
|
2020-08-14 12:20:29 +08:00 |
ZhangBiao
|
7a1e1599d8
|
|
2020-08-14 10:14:53 +08:00 |
JieLing
|
be59c59230
|
部分大图资源整理
|
2020-08-14 10:02:24 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
JieLing
|
700f396a6b
|
资源加密添加,防止使用工具获得资源
|
2020-08-13 19:30:16 +08:00 |
wangzhenxing
|
9dce11a6eb
|
测试战斗修改提交
|
2020-08-13 17:36:20 +09:00 |
ZhangBiao
|
e655562a71
|
|
2020-08-13 17:07:05 +08:00 |
ZhangBiao
|
9bac8e2bfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 16:38:57 +08:00 |
ZhangBiao
|
e397fa88e7
|
|
2020-08-13 16:38:40 +08:00 |
wangzhenxing
|
442877d3e0
|
珍奇宝阁预设代码提交
|
2020-08-13 16:38:20 +09:00 |
jiaoyangna
|
fbf7c3b41d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:44:53 +08:00 |
jiaoyangna
|
7de60dea2b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:43:51 +08:00 |
ZhangBiao
|
a180f63fe7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:43:46 +08:00 |
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
gongjiawei
|
c18cb5fc01
|
音频更新
|
2020-08-13 14:23:37 +08:00 |
ZhangBiao
|
d1ec3fa196
|
每周 每月礼包阴影问题修复
|
2020-08-13 13:33:48 +08:00 |
ZhangBiao
|
2fe27c64ec
|
|
2020-08-13 12:33:21 +08:00 |
ZhangBiao
|
a6d69bd001
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 12:00:38 +08:00 |
ZhangBiao
|
f4dad25b7a
|
神将置换bug修复
|
2020-08-13 12:00:18 +08:00 |
gaoxin
|
de27163861
|
合成修改
|
2020-08-13 11:46:55 +08:00 |
gaoxin
|
b4eef8c285
|
神将合成显示修改
|
2020-08-13 11:11:26 +08:00 |
gaoxin
|
48d8f3887b
|
修改神将合成显示问题
|
2020-08-13 10:28:16 +08:00 |
jiaoyangna
|
937d46ff75
|
xuanyuan commit
|
2020-08-12 21:10:47 +08:00 |
jiaoyangna
|
a9ebd162ec
|
轩辕 提交
|
2020-08-12 21:10:36 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
zhangqiang
|
058b18bc6f
|
最新表 协议数据
|
2020-08-12 18:29:11 +08:00 |
gongjiawei
|
0d0ae17a68
|
音频更新
|
2020-08-12 18:11:39 +08:00 |
gongjiawei
|
a5663aae42
|
音频更新
|
2020-08-12 17:53:48 +08:00 |
ZhangBiao
|
0931365a3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-12 17:03:49 +08:00 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +08:00 |
gongjiawei
|
b4e8c6803c
|
音频更新
|
2020-08-12 16:02:35 +08:00 |
gaoxin
|
809e10df79
|
Merge branch 'master_develop2' into master_develop
|
2020-08-12 14:45:01 +08:00 |
jiaoyangna
|
8c27eecbf6
|
xuanyuan update
|
2020-08-12 14:30:55 +08:00 |
jiaoyangna
|
d5c241208d
|
merge
|
2020-08-12 14:25:36 +08:00 |
gaoxin
|
4e639d2401
|
Merge branch 'master_develop2' into master_develop
|
2020-08-12 14:22:29 +08:00 |
jiaoyangna
|
95dff6f0e9
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-08-12 14:20:45 +08:00 |
jiaoyangna
|
96d47d34a8
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
# data_execl/base_data/GlobalSystemConfig.xlsx
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/RechargeCommodityConfig.xlsx
|
2020-08-12 14:17:01 +08:00 |
ZhangBiao
|
06bc9c1f1d
|
Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-12 14:15:27 +08:00 |
jiaoyangna
|
7bee1280b3
|
xuanyuan update
|
2020-08-12 14:13:28 +08:00 |
ZhangBiao
|
ed319be87e
|
神将置换
|
2020-08-12 14:13:16 +08:00 |
jiaoyangna
|
e372c84cdb
|
xuanyuan
|
2020-08-12 13:34:07 +08:00 |
jl_ios
|
8be4e2745b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-12 12:43:03 +08:00 |
jl_ios
|
14645cb184
|
iOS 打包修复无法生成luabytes文件的问题
|
2020-08-12 11:58:12 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
gongjiawei
|
8133bd8e62
|
音频更新
|
2020-08-12 11:18:44 +08:00 |
gongjiawei
|
572f6c156b
|
音频更新
|
2020-08-12 11:12:10 +08:00 |
wangzhenxing
|
6d274b7991
|
【ID1008763】
【技能】124 释放技能后回复己方后排[a]点怒气 (目标不正确,给双方后排加怒)
|
2020-08-12 10:24:02 +09:00 |
ZhangBiao
|
c1c013a007
|
神将置换 基本功能完成
|
2020-08-11 20:55:05 +08:00 |
gongjiawei
|
45fd69256e
|
音频更新
|
2020-08-11 18:38:02 +08:00 |
zhangqiang
|
b67b99ad93
|
无尽副本临时新增入口
|
2020-08-11 16:31:17 +08:00 |
gongjiawei
|
2b5a37e8d9
|
音频更新
|
2020-08-11 16:14:09 +08:00 |
jiaoyangna
|
9f186311b3
|
xuanyuan
|
2020-08-11 15:11:33 +08:00 |
jiaoyangna
|
cea8d854f9
|
no message
|
2020-08-11 14:28:15 +08:00 |
jiaoyangna
|
f7fe1d9513
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# data_execl/base_data/GlobalActivity.xlsx
# data_execl/base_data/GlobalSystemConfig.xlsx
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/RechargeCommodityConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
|
2020-08-11 14:07:10 +08:00 |
jl_ios
|
ab6be0a9e2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-11 14:05:49 +08:00 |
jl_ios
|
02b7e07d20
|
删除无用的sdk资源,bugly添加缺少的文件
|
2020-08-11 14:04:05 +08:00 |
jiaoyangna
|
16e1699e65
|
no message
|
2020-08-11 11:58:41 +08:00 |
jiaoyangna
|
179632ca21
|
no message
|
2020-08-11 11:56:03 +08:00 |
gongjiawei
|
4c5b87d922
|
音频更新
|
2020-08-11 11:29:20 +08:00 |
jiaoyangna
|
6f05841519
|
no message
|
2020-08-11 11:00:30 +08:00 |
wangzhenxing
|
109bcc49f6
|
张强对魂印增加属性修改
|
2020-08-11 11:24:22 +09:00 |
jiaoyangna
|
dc058f99e1
|
no message
|
2020-08-11 10:13:50 +08:00 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
gongjiawei
|
e56c19f1bc
|
音频更新
|
2020-08-10 17:32:01 +08:00 |
gongjiawei
|
6cbffb4abb
|
音频更新
|
2020-08-10 16:51:12 +08:00 |
zhangqiang
|
176f9d4c47
|
合成bug
|
2020-08-10 16:17:13 +08:00 |
wangzhenxing
|
7953575074
|
角色身上如果有无敌盾不会扣出怒气
|
2020-08-10 15:50:28 +09:00 |
zhangqiang
|
22ad34291b
|
献祭 和 吞卡 掉落身上装备不显示提交
|
2020-08-10 14:16:48 +08:00 |
zhangqiang
|
a417e88b0b
|
恭送编队不检测大门闹天宫 and 车迟斗法失败刷新顺序修改
|
2020-08-10 11:30:27 +08:00 |
zhangqiang
|
cca8355c33
|
神将合成提交
|
2020-08-10 11:28:25 +08:00 |
zhangqiang
|
3937426101
|
神将合成提交
|
2020-08-10 10:56:17 +08:00 |
gongjiawei
|
9307a48960
|
音频更新
|
2020-08-10 10:47:21 +08:00 |
zhangqiang
|
7749211534
|
合成修改
|
2020-08-08 19:27:10 +08:00 |
zhangqiang
|
32c788b8ac
|
神将合成代码
|
2020-08-08 18:18:26 +08:00 |
gongjiawei
|
fddd5748cf
|
音频更新
|
2020-08-08 17:01:19 +08:00 |
zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |
zhangqiang
|
6dd95ec834
|
神将合成部分显示代码
|
2020-08-08 11:06:01 +08:00 |
gaoxin
|
bab0c056eb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-07 17:35:23 +08:00 |
gaoxin
|
a35b26a215
|
修改平分概率类型的技能的概率计算方式
|
2020-08-07 17:35:16 +08:00 |
gongjiawei
|
fe738c1dea
|
音频更新
|
2020-08-07 17:33:40 +08:00 |
jiaoyangna
|
63f1dcb2c9
|
convertutf8..cs 提交
|
2020-08-07 15:19:25 +08:00 |
zhangqiang
|
f2d743a343
|
英雄合成预设更新
|
2020-08-07 14:23:05 +08:00 |
gaoxin
|
723531298d
|
删除被动194额外附加伤害也会触发效果的并导致报错的问题,
|
2020-08-07 10:57:30 +08:00 |
ZhangBiao
|
f09a0448bc
|
|
2020-08-07 10:34:18 +08:00 |
zhangqiang
|
93e1d880c8
|
英雄合成界面拼接
|
2020-08-06 18:34:04 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
jiaoyangna
|
22b02b5cca
|
encoding convert
|
2020-08-06 17:35:07 +08:00 |
wangzhenxing
|
e4cf5b8fd1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-06 18:02:20 +09:00 |
jiaoyangna
|
67f07c8214
|
代码转utf8格式
|
2020-08-06 17:59:23 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
jiaoyangna
|
41cf013543
|
convert format
|
2020-08-06 17:45:30 +08:00 |
jiaoyangna
|
8d2576e185
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-06 17:37:48 +08:00 |
jiaoyangna
|
5c13a25bb5
|
encoding convert
|
2020-08-06 17:37:42 +08:00 |
wangzhenxing
|
416cfbde79
|
技能释放后摇时间添加0.2
|
2020-08-06 18:01:59 +09:00 |
gongjiawei
|
8a5d729f71
|
音频更新
|
2020-08-06 16:12:55 +08:00 |
ZhangBiao
|
a125fe5840
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-06 15:05:50 +08:00 |
ZhangBiao
|
3522da8a3a
|
森罗去除遮罩
|
2020-08-06 15:05:33 +08:00 |
skuld
|
2eebab650e
|
替换 万象境图片
|
2020-08-06 10:57:17 +08:00 |
ZhangBiao
|
ed373d1851
|
Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换
|
2020-08-06 10:43:28 +08:00 |
ZhangBiao
|
44497f73bd
|
神将置换页面制作1
|
2020-08-06 10:43:11 +08:00 |
zhangqiang
|
3bb0906865
|
法宝归元中文表
|
2020-08-06 10:38:55 +08:00 |
gaoxin
|
fee7d18688
|
森罗幻境,修复非快速战斗怪物点不删除的问题
|
2020-08-05 22:47:21 +08:00 |
Genkins
|
3f1eb6db0f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-05 21:20:22 +08:00 |
Genkins
|
7dd6f75e24
|
删除Spine UI对象时,释放模型资源
|
2020-08-05 21:20:13 +08:00 |
ZhangBiao
|
54783bef35
|
森罗快速点击服务器报错问题修复
|
2020-08-05 21:12:50 +08:00 |
jiaoyangna
|
c095459166
|
no message
|
2020-08-05 21:01:20 +08:00 |
ZhangBiao
|
456ab0aa92
|
森罗 进图后2.5秒才能开始移动,避免服务器小差
|
2020-08-05 19:32:36 +08:00 |
ZhangBiao
|
eeaa1f26f8
|
|
2020-08-05 19:18:15 +08:00 |
zhangqiang
|
0a37b3cb11
|
法宝回归协议提交
|
2020-08-07 12:41:35 +08:00 |
gongjiawei
|
6c4dab9fbb
|
音頻跟新
|
2020-08-05 18:15:19 +08:00 |
lihaiyang
|
a6f1259075
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-05 18:06:28 +08:00 |
ZhangBiao
|
879331e416
|
森罗炸弹数量刷新,奖励和generalpanel界面适配
|
2020-08-05 18:02:47 +08:00 |
ZhangBiao
|
a1b9ca69f6
|
Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换
|
2020-08-05 17:16:30 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |
ZhangBiao
|
d72d87d497
|
|
2020-08-05 17:16:06 +08:00 |
ZhangBiao
|
203514d85f
|
神将置换入口添加
|
2020-08-05 16:30:02 +08:00 |
gaoxin
|
195a48d3fe
|
副本添加最大战斗力判断
|
2020-08-05 16:26:45 +08:00 |
gongjiawei
|
ee6133f289
|
音频更新
|
2020-08-05 16:08:07 +08:00 |
jiaoyangna
|
7d5efc523e
|
图鉴修改提交
|
2020-08-05 16:04:06 +08:00 |
jiaoyangna
|
0a26260692
|
删除红点
|
2020-08-05 15:49:44 +08:00 |
jiaoyangna
|
220577bd0d
|
图鉴修改
|
2020-08-05 15:43:40 +08:00 |
ZhangBiao
|
ee19d26bd3
|
神将置换界面创建
|
2020-08-05 15:36:22 +08:00 |
jiaoyangna
|
c5bced9968
|
副本修改提交
|
2020-08-05 15:00:56 +08:00 |
ZhangBiao
|
6f0c40707e
|
置换界面
|
2020-08-05 14:10:46 +08:00 |
zhangqiang
|
ed53f7e760
|
Merge branch 'master_develop' into master_develop2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# data_execl/base_data/BeStronger.xlsx
# data_execl/base_data/EquipTalismana.xlsx
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-07 06:54:04 +08:00 |
gongjiawei
|
0c1250f88c
|
音频更新
|
2020-08-05 11:43:13 +08:00 |
zhangqiang
|
54148395b4
|
日常副本判断开启临时添加战力计算
|
2020-08-07 06:06:55 +08:00 |
jiaoyangna
|
dd4800f657
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 20:49:48 +08:00 |
jiaoyangna
|
1b7f35e41f
|
bg update
|
2020-08-04 20:49:42 +08:00 |
ZhangBiao
|
989703a0e4
|
乾坤宝盒单抽bug修复、四元阵赠送“元神玉”
|
2020-08-04 20:30:26 +08:00 |
ZhangBiao
|
6acaa8549d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 20:23:16 +08:00 |
ZhangBiao
|
ee28c18254
|
森罗bug修复
|
2020-08-04 20:22:56 +08:00 |
jiaoyangna
|
802286d743
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:41:22 +08:00 |
jiaoyangna
|
e9438df1b7
|
图鉴优化
|
2020-08-04 18:41:17 +08:00 |
zhangqiang
|
e45e6c9325
|
公会技能升级优化
|
2020-08-04 18:37:30 +08:00 |
ZhangBiao
|
7255baef99
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:19:38 +08:00 |
ZhangBiao
|
f548b53b46
|
开引导 在森罗杀进程 重新登陆后 不回到森罗
|
2020-08-04 18:19:20 +08:00 |
gongjiawei
|
4c0c01cefe
|
音频更新
|
2020-08-04 17:47:38 +08:00 |
zhangqiang
|
7b73f4ae77
|
升星成功界面加天赋解锁显示
|
2020-08-04 17:24:15 +08:00 |
ZhangBiao
|
ade7ee88bc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 16:19:06 +08:00 |
ZhangBiao
|
24381aba57
|
森罗bug修复
|
2020-08-04 16:18:48 +08:00 |
zhangqiang
|
e11b5fd7bb
|
寻宝红点修改 添加解锁新章节音效
|
2020-08-04 15:33:44 +08:00 |
gongjiawei
|
15494b2117
|
音频更新
|
2020-08-04 14:33:15 +08:00 |
zhangqiang
|
0a8bdc5765
|
援助 十绝阵 合成 提示性bug
|
2020-08-04 14:02:28 +08:00 |
gongjiawei
|
52e0c553f7
|
音频更新
|
2020-08-04 11:13:08 +08:00 |
jiaoyangna
|
9a53f20f60
|
小游戏提交
|
2020-08-04 10:39:16 +08:00 |
gaoxin
|
04e6c2fb42
|
删除不必要的符号
|
2020-08-03 21:23:16 +08:00 |
gaoxin
|
01b6b4e1fd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 21:08:43 +08:00 |
gaoxin
|
b257aa2eef
|
dragview回滚
|
2020-08-03 21:08:38 +08:00 |
ZhangBiao
|
f6b827c922
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 20:02:10 +08:00 |
ZhangBiao
|
c2024a15cb
|
bug修复
|
2020-08-03 20:01:59 +08:00 |
zhangqiang
|
13cad0dd5b
|
排行榜切磋玩回来立绘丢了问题修改
|
2020-08-03 19:41:54 +08:00 |
gaoxin
|
5ed5f7b8c4
|
修改Loading界面资源位置
|
2020-08-03 18:49:24 +08:00 |
jiaoyangna
|
6c6f28f634
|
fix bug
|
2020-08-03 18:40:20 +08:00 |
jiaoyangna
|
3ff95a1796
|
fix bug
|
2020-08-03 17:23:28 +08:00 |
jiaoyangna
|
ffdb4c9666
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 17:07:35 +08:00 |