lihaiyang
|
95d6d13f25
|
轩辕全天开启 英文名字重复
|
2020-08-14 09:40:52 +08:00 |
lihaiyang
|
ce7f4b2790
|
修改轩辕宝境怪物属性
|
2020-08-13 21:54:58 +08:00 |
altair
|
47f8542201
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 20:59:17 +08:00 |
altair
|
5edfd6548e
|
修改传记错误
|
2020-08-13 20:59:07 +08:00 |
shihongyi
|
deeedf7aea
|
塔怪1
|
2020-08-13 20:55:47 +08:00 |
shihongyi
|
93a20786cb
|
限时兑换
|
2020-08-13 20:39:55 +08:00 |
ZhangBiao
|
41cea65207
|
|
2020-08-13 17:17:01 +08:00 |
shihongyi
|
bae1143471
|
剑影仙踪拍脸等级、兑换活动控制
|
2020-08-13 16:53:07 +08:00 |
skuld
|
451a279458
|
添加轩辕宝境入口描述文字
|
2020-08-13 15:47:12 +08:00 |
lihaiyang
|
76e7b5d406
|
轩辕宝境怪物属性初版
|
2020-08-13 15:38:53 +08:00 |
lihaiyang
|
8702f62d1f
|
轩辕宝境开启等级修改为75级
|
2020-08-13 15:35:05 +08:00 |
lihaiyang
|
b918f8c06b
|
轩辕免费次数和购买次数位置修改
|
2020-08-13 15:33:32 +08:00 |
jiaoyangna
|
beaaeed139
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:21:50 +08:00 |
lihaiyang
|
9a75e685ac
|
轩辕宝境邮件配合
|
2020-08-13 14:21:28 +08:00 |
liujiaqi
|
b31f0b52d1
|
签到宝箱
|
2020-08-13 13:43:41 +08:00 |
altair
|
9d986d7c0b
|
修改道具图标及名称
|
2020-08-13 11:13:00 +08:00 |
altair
|
b9b78ca37e
|
修改置换玉图标
|
2020-08-13 10:29:33 +08:00 |
liujiaqi
|
4e54d85fdc
|
技能选择目标回调
|
2020-08-13 10:14:39 +08:00 |
shihongyi
|
dee104669b
|
##bug
|
2020-08-13 09:51:22 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
liujiaqi
|
c4938b7bd3
|
修正英雄主动技能,天赋,法宝,魂印描述增加标点
|
2020-08-12 20:42:57 +08:00 |
shihongyi
|
1de6a6bd83
|
bug、幻境
|
2020-08-12 20:41:22 +08:00 |
altair
|
fde8f838a6
|
修改道具图标
|
2020-08-12 19:50:22 +08:00 |
shihongyi
|
60eb6d985d
|
bugfix
|
2020-08-12 17:00:26 +08:00 |
lihaiyang
|
af2d171298
|
合并添加轩辕宝境对应礼包
|
2020-08-12 14:33:12 +08:00 |
lihaiyang
|
c3fe86af56
|
轩辕宝境添加对应道具
|
2020-08-12 14:30:42 +08:00 |
lihaiyang
|
27980e88e7
|
轩辕合并表格 轩辕宝境从四个变成一个
|
2020-08-12 14:27:19 +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 |
shihongyi
|
2d63f71ff5
|
分支合并手动解决冲突,待测
|
2020-08-12 14:13:50 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +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 |
lihaiyang
|
e443ecc249
|
轩辕 战斗次数修改类型
|
2020-08-11 18:37:44 +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 |
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
|
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 |
lihaiyang
|
8ae6473de0
|
轩辕宝境 属性变化列 配置成buff
|
2020-08-10 19:13:30 +08:00 |
lihaiyang
|
15f073dbd1
|
轩辕宝境 伤害提升配置成buff id33增加 34 降低
|
2020-08-10 19:12:57 +08:00 |
skuld
|
916a6f7e25
|
合并置换玉消耗的ID的配置
|
2020-08-10 15:11:26 +08:00 |
skuld
|
7aac974925
|
添加新玩法帮助文字
|
2020-08-10 15:03:37 +08:00 |
shihongyi
|
686c7c468f
|
修改阵营属性权限、戒灵宝藏价格198
|
2020-08-10 14:25:56 +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 |
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 |
lihaiyang
|
6262e166bb
|
轩辕固定奖励配置到掉落组
|
2020-08-10 10:53:19 +08:00 |
lihaiyang
|
f13731104b
|
轩辕 固定掉落配置到掉落表中
|
2020-08-10 10:51:32 +08:00 |
skuld
|
1ee836e1eb
|
置换玉道具ID
|
2020-08-10 10:41:57 +08:00 |
altair
|
f9d334ed29
|
修改角色背景
|
2020-08-10 10:12:49 +08:00 |
zhangqiang
|
32c788b8ac
|
神将合成代码
|
2020-08-08 18:18:26 +08:00 |
lihaiyang
|
e85c8b00c6
|
轩辕界面显示用 由掉落表id改为物品表id
|
2020-08-08 18:10:02 +08:00 |
lihaiyang
|
4658d6368e
|
no message
|
2020-08-08 15:56:28 +08:00 |
zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |
lihaiyang
|
d13fbcf375
|
轩辕宝镜的礼包位置和礼包次数修改
|
2020-08-08 15:47:15 +08:00 |
lihaiyang
|
b1154d7fca
|
修改轩辕宝镜购买价格
|
2020-08-08 15:39:33 +08:00 |
lihaiyang
|
2fe4dbc58e
|
特权切换为一维数组
|
2020-08-08 14:13:33 +08:00 |
lihaiyang
|
f4cd220e79
|
道杀妖 妖克佛 佛度人 人斩道 添加tips 并且更新对应关系
|
2020-08-07 18:39:59 +08:00 |
liujiaqi
|
996a4168e2
|
绿篮紫色宝物自选箱不进版本绿蓝宝物随机描述修改纵排技能攻击目标修改
|
2020-08-07 17:58:12 +08:00 |
shihongyi
|
dfc2f80069
|
无效自选箱不进版本
|
2020-08-07 17:48:19 +08:00 |
gongjiawei
|
fe738c1dea
|
音频更新
|
2020-08-07 17:33:40 +08:00 |
liujiaqi
|
ca54d29c40
|
1132追击目标更正,神女魂印名称修正狂噬戮兽描述修正
|
2020-08-07 17:12:25 +08:00 |
liujiaqi
|
85433824da
|
狂噬戮兽魂印描述修正,神女魂印修正为妈祖魂印,1132技能追击目标修正
|
2020-08-07 16:40:02 +08:00 |
lihaiyang
|
5a428f6d4d
|
修改轩辕宝境未通关时显示的难度
|
2020-08-07 16:38:58 +08:00 |
lihaiyang
|
0ad0461004
|
宝物奖励 显示配置
|
2020-08-07 16:14:58 +08:00 |
lihaiyang
|
7d4a9ef74c
|
轩辕宝境首通奖励完全配置不需要相加
|
2020-08-07 16:14:07 +08:00 |
lihaiyang
|
8a7b0dd708
|
修改表头备注
|
2020-08-07 16:12:15 +08:00 |
lihaiyang
|
cc63406888
|
奖励类型改为2-前后端都可以用
|
2020-08-07 15:48:00 +08:00 |
liujiaqi
|
800821f011
|
1132追击目标变更
|
2020-08-07 14:45:19 +08:00 |
lihaiyang
|
9773fc1b2e
|
更换第一层副本怪物,添加被动技能 怪物星级加强
|
2020-08-07 11:25:09 +08:00 |
liujiaqi
|
487e321192
|
付费活动开启
|
2020-08-07 11:04:34 +08:00 |
shihongyi
|
428ee21777
|
炸弹 回春 进背包
|
2020-08-06 18:24:21 +08:00 |
shihongyi
|
8dbd031fa7
|
无效属性置0
|
2020-08-06 18:20:32 +08:00 |
shihongyi
|
a4f9309f37
|
星级等级上限
|
2020-08-06 18:17:51 +08:00 |
liujiaqi
|
ccee02a26a
|
开服狂欢三日登陆奖励更改为唤元神符
|
2020-08-06 18:03:02 +08:00 |
lihaiyang
|
6b149e6bca
|
阵营属性,加成比例,修改为 提升比例为攻击属性 降低改为降低攻击力
|
2020-08-06 17:07:00 +08:00 |
lihaiyang
|
856044d745
|
轩辕宝境 怪物属性微调
|
2020-08-06 17:03:09 +08:00 |
gongjiawei
|
8a5d729f71
|
音频更新
|
2020-08-06 16:12:55 +08:00 |
zhangqiang
|
3bb0906865
|
法宝归元中文表
|
2020-08-06 10:38:55 +08:00 |
lihaiyang
|
cc827dd743
|
74.75.76.77 改为1234
|
2020-08-06 10:38:19 +08:00 |
lihaiyang
|
fa37dbc04b
|
修改特权礼包 为等级开启 75级开启 时间999999
|
2020-08-06 10:23:05 +08:00 |
shihongyi
|
b617c30639
|
置换及合成qa
|
2020-08-06 09:43:22 +08:00 |
lihaiyang
|
ca572b6294
|
为了不报错 特权活动时间类型临时改为5
|
2020-08-05 21:45:46 +08:00 |
lihaiyang
|
4d2100a22c
|
奖励组改为对应副本掉落对应宝物
|
2020-08-05 21:45:10 +08:00 |
shihongyi
|
66a51803b8
|
置换及合成qa
|
2020-08-05 20:27:17 +08:00 |
lihaiyang
|
7f328f76c9
|
轩辕宝境排行榜奖励修改
|
2020-08-05 20:02:25 +08:00 |
lihaiyang
|
1ff898b957
|
轩辕宝境 还需要修改 临时配置上传(需要配置成对应掉落)
|
2020-08-05 19:52:46 +08:00 |
lihaiyang
|
fc6ad943f6
|
轩辕宝境特权配置
|
2020-08-05 19:52:03 +08:00 |
lihaiyang
|
3a05b61085
|
添加轩辕宝境挑战特权82001物品
|
2020-08-05 19:48:20 +08:00 |
lihaiyang
|
fb5829bf8a
|
轩辕宝境怪物 和怪物组 临时配置上传
|
2020-08-05 19:47:30 +08:00 |