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 |
skuld
|
916a6f7e25
|
合并置换玉消耗的ID的配置
|
2020-08-10 15:11:26 +08:00 |
skuld
|
7aac974925
|
添加新玩法帮助文字
|
2020-08-10 15:03:37 +08:00 |
wangzhenxing
|
7953575074
|
角色身上如果有无敌盾不会扣出怒气
|
2020-08-10 15:50:28 +09:00 |
shihongyi
|
686c7c468f
|
修改阵营属性权限、戒灵宝藏价格198
|
2020-08-10 14:25:56 +08:00 |
zhangqiang
|
22ad34291b
|
献祭 和 吞卡 掉落身上装备不显示提交
|
2020-08-10 14:16:48 +08:00 |
lihaiyang
|
42fc9bc3b1
|
轩辕 属性类型修改
|
2020-08-10 14:12:27 +08:00 |
lihaiyang
|
0e5e4827a0
|
挑战次数 删除计算用多余配置
|
2020-08-10 14:05:42 +08:00 |
lihaiyang
|
ee2d5c96ce
|
轩辕新加字段首字母改为大写
|
2020-08-10 11:40:00 +08:00 |
zhangqiang
|
a417e88b0b
|
恭送编队不检测大门闹天宫 and 车迟斗法失败刷新顺序修改
|
2020-08-10 11:30:27 +08:00 |
zhangqiang
|
cca8355c33
|
神将合成提交
|
2020-08-10 11:28:25 +08:00 |
skuld
|
107096bd96
|
添加置换玉消耗
|
2020-08-10 11:20:13 +08:00 |
zhangqiang
|
15722ee892
|
Merge branch '0功能/法宝归元和神将置换' into master_develop2
|
2020-08-10 11:01:46 +08:00 |
lihaiyang
|
3279cfd53f
|
轩辕添加编队,删除显示列调整到掉落表中,扫荡奖励,首次奖励各走各列
|
2020-08-10 10:56:25 +08:00 |
zhangqiang
|
3937426101
|
神将合成提交
|
2020-08-10 10:56:17 +08:00 |
lihaiyang
|
6262e166bb
|
轩辕固定奖励配置到掉落组
|
2020-08-10 10:53:19 +08:00 |
lihaiyang
|
f13731104b
|
轩辕 固定掉落配置到掉落表中
|
2020-08-10 10:51:32 +08:00 |
gongjiawei
|
9307a48960
|
音频更新
|
2020-08-10 10:47:21 +08:00 |
skuld
|
1ee836e1eb
|
置换玉道具ID
|
2020-08-10 10:41:57 +08:00 |
altair
|
f9d334ed29
|
修改角色背景
|
2020-08-10 10:12:49 +08:00 |
zhangqiang
|
7749211534
|
合成修改
|
2020-08-08 19:27:10 +08:00 |
zhangqiang
|
32c788b8ac
|
神将合成代码
|
2020-08-08 18:18:26 +08:00 |
lihaiyang
|
e85c8b00c6
|
轩辕界面显示用 由掉落表id改为物品表id
|
2020-08-08 18:10:02 +08:00 |
gongjiawei
|
fddd5748cf
|
音频更新
|
2020-08-08 17:01:19 +08:00 |
lihaiyang
|
4658d6368e
|
no message
|
2020-08-08 15:56:28 +08:00 |
lihaiyang
|
c0e0d6ab6b
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-08 15:55:10 +08:00 |
zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |
lihaiyang
|
d13fbcf375
|
轩辕宝镜的礼包位置和礼包次数修改
|
2020-08-08 15:47:15 +08:00 |
jiaoyangna
|
291dbbe816
|
Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-08 15:46:25 +08:00 |
jiaoyangna
|
5dc0f1045c
|
no message
|
2020-08-08 15:46:16 +08:00 |
lihaiyang
|
b1154d7fca
|
修改轩辕宝镜购买价格
|
2020-08-08 15:39:33 +08:00 |
lihaiyang
|
2fe4dbc58e
|
特权切换为一维数组
|
2020-08-08 14:13:33 +08:00 |
zhangqiang
|
6dd95ec834
|
神将合成部分显示代码
|
2020-08-08 11:06:01 +08:00 |