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 |
shihongyi
|
2d63f71ff5
|
分支合并手动解决冲突,待测
|
2020-08-12 14:13:50 +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 |
shihongyi
|
4c81a5110e
|
进阶升星属性
|
2020-08-12 10:56:41 +08:00 |
altair
|
c269e053d5
|
修改宝魂图标
|
2020-08-12 10:46:54 +08:00 |
altair
|
254181112d
|
修改道具图标
|
2020-08-12 10:27:04 +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 |
lihaiyang
|
926a33eb47
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-11 19:10:57 +08:00 |
gongjiawei
|
45fd69256e
|
音频更新
|
2020-08-11 18:38:02 +08:00 |
lihaiyang
|
e443ecc249
|
轩辕 战斗次数修改类型
|
2020-08-11 18:37:44 +08:00 |
jiaoyangna
|
4b6c60d2ca
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-11 17:11:07 +08:00 |
jiaoyangna
|
b43d36109c
|
log
|
2020-08-11 17:10:12 +08:00 |
zhangqiang
|
b67b99ad93
|
无尽副本临时新增入口
|
2020-08-11 16:31:17 +08:00 |
lihaiyang
|
c5627194da
|
轩辕宝境问好内描述配置
|
2020-08-11 16:28:03 +08:00 |
lihaiyang
|
fdf8cfdaa5
|
轩辕宝境 修改人物对应上阵数量
|
2020-08-11 16:26:52 +08:00 |
gongjiawei
|
2b5a37e8d9
|
音频更新
|
2020-08-11 16:14:09 +08:00 |
jiaoyangna
|
13e6f5cb19
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-11 15:11:39 +08:00 |
jiaoyangna
|
9f186311b3
|
xuanyuan
|
2020-08-11 15:11:33 +08:00 |
lihaiyang
|
ed11c4f6b8
|
轩辕宝境问号 临时配置占格子
|
2020-08-11 14:54:12 +08:00 |
lihaiyang
|
28fba64cce
|
轩辕宝境 表合并 伤害强化提示配置
|
2020-08-11 14:51:47 +08:00 |
lihaiyang
|
a2b989e3d8
|
轩辕宝境表合并 删除三个只剩下一个
|
2020-08-11 14:51:03 +08:00 |
lihaiyang
|
9bd1b05036
|
轩辕 增加特权礼包
|
2020-08-11 14:50:05 +08:00 |
lihaiyang
|
8ed6a3f80b
|
添加特权符
|
2020-08-11 14:49: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
|
31c993438b
|
忽略文件.DS_Store
|
2020-08-11 14:04:39 +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
|
ae1d30bb9a
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-11 09:49:16 +08:00 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
lihaiyang
|
8ae6473de0
|
轩辕宝境 属性变化列 配置成buff
|
2020-08-10 19:13:30 +08:00 |
lihaiyang
|
15f073dbd1
|
轩辕宝境 伤害提升配置成buff id33增加 34 降低
|
2020-08-10 19:12:57 +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 |