zhangqiang
|
5e4cdffa80
|
遴选提交
|
2020-08-13 15:18:04 +08:00 |
zhangqiang
|
b6e6cd1f84
|
hw android sdk .lua change
|
2020-08-13 15:06:19 +08: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 |
zhangqiang
|
e8e94525d4
|
接入SDK 新增临时 Android 工程
|
2020-08-12 16:33:53 +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 |
zhangqiang
|
c988b7d511
|
buildABs提交
|
2020-08-11 15:53:48 +08:00 |
zhangqiang
|
063b246fce
|
修改xml提交
|
2020-08-11 15:35:41 +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 |
zhangqiang
|
f33f84b967
|
海外sdk修改提交
|
2020-08-11 13:50:47 +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 |