ZhangBiao
|
7a1e1599d8
|
|
2020-08-14 10:14:53 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08: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
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +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 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +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 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +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 |
zhangqiang
|
b67b99ad93
|
无尽副本临时新增入口
|
2020-08-11 16:31:17 +08:00 |
jiaoyangna
|
9f186311b3
|
xuanyuan
|
2020-08-11 15:11:33 +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 |
jiaoyangna
|
16e1699e65
|
no message
|
2020-08-11 11:58:41 +08:00 |
jiaoyangna
|
179632ca21
|
no message
|
2020-08-11 11:56:03 +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 |
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 |
zhangqiang
|
7749211534
|
合成修改
|
2020-08-08 19:27:10 +08:00 |
zhangqiang
|
32c788b8ac
|
神将合成代码
|
2020-08-08 18:18:26 +08:00 |
zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |
zhangqiang
|
6dd95ec834
|
神将合成部分显示代码
|
2020-08-08 11:06:01 +08:00 |
gaoxin
|
a35b26a215
|
修改平分概率类型的技能的概率计算方式
|
2020-08-07 17:35:16 +08:00 |
zhangqiang
|
f2d743a343
|
英雄合成预设更新
|
2020-08-07 14:23:05 +08:00 |
gaoxin
|
723531298d
|
删除被动194额外附加伤害也会触发效果的并导致报错的问题,
|
2020-08-07 10:57:30 +08:00 |
zhangqiang
|
93e1d880c8
|
英雄合成界面拼接
|
2020-08-06 18:34:04 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
wangzhenxing
|
416cfbde79
|
技能释放后摇时间添加0.2
|
2020-08-06 18:01:59 +09: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 |
ZhangBiao
|
3522da8a3a
|
森罗去除遮罩
|
2020-08-06 15:05:33 +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 |
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 |
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 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |
ZhangBiao
|
203514d85f
|
神将置换入口添加
|
2020-08-05 16:30:02 +08:00 |
gaoxin
|
195a48d3fe
|
副本添加最大战斗力判断
|
2020-08-05 16:26:45 +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 |
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 |
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
|
f548b53b46
|
开引导 在森罗杀进程 重新登陆后 不回到森罗
|
2020-08-04 18:19:20 +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 |
zhangqiang
|
0a8bdc5765
|
援助 十绝阵 合成 提示性bug
|
2020-08-04 14:02:28 +08:00 |
jiaoyangna
|
9a53f20f60
|
小游戏提交
|
2020-08-04 10:39:16 +08:00 |
gaoxin
|
04e6c2fb42
|
删除不必要的符号
|
2020-08-03 21:23:16 +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 |
jiaoyangna
|
6c6f28f634
|
fix bug
|
2020-08-03 18:40:20 +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 |
jiaoyangna
|
3c6043d32c
|
destroy guildmaincitypanel close playerheadview
|
2020-08-03 17:07:24 +08:00 |
ZhangBiao
|
ab93491cfe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 16:59:50 +08:00 |
ZhangBiao
|
9b28e7c140
|
森罗bug修改
|
2020-08-03 16:59:37 +08:00 |
zhangqiang
|
72dd128c1f
|
添加星级天赋描述叠加 去掉无用打印
|
2020-08-03 16:49:44 +08:00 |
ZhangBiao
|
a9f8f39280
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 16:11:21 +08:00 |
ZhangBiao
|
0cd5ffca9d
|
魂印特效关闭
|
2020-08-03 16:11:04 +08:00 |
jiaoyangna
|
54aae5181f
|
fix bug
|
2020-08-03 15:51:48 +08:00 |
gaoxin
|
70cd06da2b
|
计算战斗力卡顿的问题优化
|
2020-08-03 15:36:29 +08:00 |
ZhangBiao
|
880b52763f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 15:20:39 +08:00 |
ZhangBiao
|
434aaeccff
|
魂印特效 无用log删除
|
2020-08-03 15:20:18 +08:00 |
jiaoyangna
|
5f20e3e100
|
fixed bug
|
2020-08-03 13:37:21 +08:00 |
ZhangBiao
|
971245b8cc
|
充值恢复
|
2020-08-03 10:39:26 +08:00 |
jiaoyangna
|
01e5a62715
|
#115003 UnityLogError
E:/Git/JL/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua:373: table index is nil ,
UnityEngine.Application.CallLogCallback(String, String, LogType, Boolean) 公会红包红点的问题
|
2020-08-03 10:36:45 +08:00 |
jiaoyangna
|
89dbd09856
|
resolve hero tails update
|
2020-08-03 10:32:20 +08:00 |
jiaoyangna
|
4ab47f9a01
|
resolve hero commit
|
2020-08-03 10:31:43 +08:00 |
jiaoyangna
|
8b3bcecb59
|
activity commit
|
2020-08-03 10:18:04 +08:00 |
gaoxin
|
0a19c1dd82
|
优化红点检测机制为分帧刷新,优化人物升级红点检测
|
2020-08-01 13:15:27 +08:00 |
gaoxin
|
054c04c465
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-01 11:17:49 +08:00 |
gaoxin
|
6bfebc928f
|
战斗日志打印文件名修改,战斗数据optiondata变为userdata
|
2020-08-01 11:16:33 +08:00 |
zhangqiang
|
b6de5d609a
|
排行切磋完出来 排行榜为空 修复
|
2020-08-19 04:47:37 +08:00 |
jiaoyangna
|
7a0848100a
|
resolve hero tails update
|
2020-07-31 18:36:54 +08:00 |
jiaoyangna
|
cc7a9bda0c
|
resolve hero commit
|
2020-07-31 18:25:19 +08:00 |
gaoxin
|
4c93923b39
|
尝试修复编队和角色装备界面报错的问题
|
2020-07-31 18:24:13 +08:00 |
gaoxin
|
a4bcead414
|
无用log删除
|
2020-07-31 18:04:11 +08:00 |
zhangqiang
|
93c1913a73
|
适配修改
|
2020-08-19 03:31:43 +08:00 |
zhangqiang
|
fc7552f55f
|
车迟抢夺玩家人物头像属性修改 四元阵修改预设文字
|
2020-08-19 02:25:01 +08:00 |
ZhangBiao
|
ab8889ae8c
|
破阵诛仙活动界面
|
2020-07-31 16:18:14 +08:00 |
jiaoyangna
|
242896fede
|
add soulprint effect commit
|
2020-08-02 09:16:45 +08:00 |
zhangqiang
|
b853030d8a
|
巅峰战被淘汰还可自动进入战斗bug修复
|
2020-08-19 00:09:35 +08:00 |
ZhangBiao
|
dd06fc4652
|
充值入口恢复,加 充值switch
|
2020-07-31 13:35:15 +08:00 |
zhangqiang
|
39083460c1
|
献祭坛适配
|
2020-08-18 21:54:30 +08:00 |
zhangqiang
|
b37009ea25
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 17:32:48 +08:00 |
zhangqiang
|
d727e866a7
|
英雄升级卡顿优化
|
2020-08-18 17:32:26 +08:00 |
ZhangBiao
|
44ace7a129
|
充值入口恢复
|
2020-07-31 10:33:05 +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
|
e786a479f5
|
服务器维护时,不再请求连接服务器
|
2020-07-30 18:50:41 +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 |
zhangqiang
|
588d2152b2
|
抽卡主城红点修改
|
2020-08-15 23:46:17 +08:00 |
zhangqiang
|
1ac12b1721
|
妖精单抽提示数量错误修改
|
2020-08-15 23:23:38 +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
|
1379fe1f0e
|
部分log删除
|
2020-07-30 14:13:20 +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
|
83999b75d5
|
战斗内添加日志上报功能
|
2020-07-30 10:57:29 +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 |
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 |
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 |
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
|
8261fe72a4
|
尝试修改第一次引导战斗会进入解锁章节界面的问题
|
2020-07-29 11:40:15 +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 |
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
|
43ee7dd577
|
限时召唤提交
|
2020-07-28 20:09:41 +08:00 |
jiaoyangna
|
bf77931b88
|
边框修改提交
|
2020-07-28 18:38:19 +08:00 |
zhangqiang
|
acba506782
|
寻宝添加6星显示
|
2020-07-31 18:40:22 +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
|
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 |
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
|
e7e3de1674
|
引导打点不再传递日期
|
2020-07-28 16:12:29 +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
|
ee79439f39
|
万象境 bug修复
|
2020-07-28 10:42:29 +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 |
jiaoyangna
|
b6c2b22a3d
|
【日常副本优化】每个日常副本标题下方增加副本描述文字
|
2020-07-27 20:34:59 +08:00 |
jiaoyangna
|
54b3aad5e9
|
【副本优化】副本入口处增加文字提示
|
2020-07-27 19:48:05 +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 |
JieLing
|
64ff767121
|
Merge branch '接入SDK' into master_develop
|
2020-07-27 17:53:54 +08:00 |
JieLing
|
67914ba7dd
|
引导打点数据类型修改
|
2020-07-27 17:48:33 +08:00 |
zhangqiang
|
ac67088a90
|
背包合成不弹英雄展示
|
2020-07-29 00:11:36 +08:00 |
zhangqiang
|
36e18b7519
|
背包碎片排序 限时兑换调整预设
|
2020-07-28 23:40:36 +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 |
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
|
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
|
b323148076
|
尝试修改app安装事件在创建角色事件之后触发的问题
|
2020-07-26 11:14:29 +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 |
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 |