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 |
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 |
lihaiyang
|
4b30dd9c7c
|
特权轩辕宝境挑战次数配置
|
2020-08-05 19:46:13 +08:00 |
lihaiyang
|
6411b30ca3
|
轩辕宝境配置表上传
|
2020-08-05 19:45:31 +08:00 |
lihaiyang
|
ed28a60ac1
|
轩辕宝境·奖励配置
|
2020-08-05 19:43:50 +08:00 |
lihaiyang
|
9f2087e9ea
|
轩辕开始时间(星期)
|
2020-08-05 19:42:57 +08:00 |
shihongyi
|
89510e36f1
|
巅峰赛引导误填bug
|
2020-08-05 17:55:15 +08:00 |
ZhangBiao
|
203514d85f
|
神将置换入口添加
|
2020-08-05 16:30:02 +08:00 |
shihongyi
|
2f78b8c2e3
|
阵营抽保底
|
2020-08-05 15:47:04 +08:00 |
shihongyi
|
0caa56d2a9
|
置换功能
|
2020-08-05 15:38:20 +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 |
shihongyi
|
1502f8ec1b
|
转盘金币产出下调
|
2020-08-05 15:32:04 +08:00 |
ZhangBiao
|
6f0c40707e
|
置换界面
|
2020-08-05 14:10:46 +08:00 |
shihongyi
|
73f79d1193
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-05 13:57:56 +08:00 |
gaoxin
|
519a24eb2c
|
修复引导合成碎片时点击速度太快导致引导错误的问题
|
2020-08-05 13:55:03 +08:00 |
shihongyi
|
ac3f0e8df3
|
限时抽时间
|
2020-08-05 13:51:47 +08:00 |
shihongyi
|
1e55175acb
|
限时抽活动时间
|
2020-08-05 10:59:36 +08:00 |
liujiaqi
|
6fb9b33978
|
新增挂机地图
|
2020-08-04 18:22:11 +08:00 |
kansa
|
2ceb319c5f
|
新增挂机背景图1
|
2020-08-04 17:57:39 +08:00 |
gongjiawei
|
4c0c01cefe
|
音频更新
|
2020-08-04 17:47:38 +08:00 |
kansa
|
de8f04b9bc
|
修改十绝阵怪物预览的显示星级
|
2020-08-04 17:25:24 +08:00 |
liujiaqi
|
cf8c32c645
|
我要变强点将神符换元神符描述修改,妈祖庇佑改为神女庇佑魂印
|
2020-08-04 16:25:52 +08:00 |
gongjiawei
|
15494b2117
|
音频更新
|
2020-08-04 14:33:15 +08:00 |
kansa
|
c0730e64a3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 14:12:44 +08:00 |
kansa
|
8b47a37eb3
|
推迟森罗幻境刷新时间
|
2020-08-04 14:12:12 +08:00 |
liujiaqi
|
b4cdaaafe4
|
累冲448档碎片奖励修正签到碎片奖励修正
|
2020-08-04 14:12:09 +08:00 |
shihongyi
|
28e158032e
|
统一 5星碎片只商店
|
2020-08-04 11:58:16 +08:00 |
liujiaqi
|
10dc26b855
|
开服狂欢第七日全民超值大小礼包调换位置
|
2020-08-04 11:11:18 +08:00 |
shihongyi
|
de441aa61d
|
补充 环境 101~200 怪
|
2020-08-03 19:22:49 +08:00 |
liujiaqi
|
b0a624aaff
|
孔雀明王、净光天女、幽魂姬主动技能描述修正,
孔雀明王、东陵圣母、杨戬、金翅大鹏、蚩尤天赋描述修正
治疗机制修改为治疗生命百分比最低单位
姜子牙6星激活特性属性修正,吕洞宾4阶突破天赋属性修正,孟婆4阶突破天赋属性修正,夜叉8星激活天赋属性修正,阎罗王8星激活属性天赋修正,水德星君2阶突破天赋属性修正,聚宝盆圣物描述修正
142107 150105 151109 146105 152109 10070102被动技能属性修正
|
2020-08-03 17:54:36 +08:00 |
altair
|
c47507f128
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-31 19:40:07 +08:00 |
altair
|
991fb91fca
|
修改法宝名称及图标
|
2020-07-31 19:39:58 +08:00 |
gongjiawei
|
7590410807
|
音频更新
|
2020-07-31 17:58:25 +08:00 |
shihongyi
|
e25f297c89
|
法宝末级不填消耗以计算满级
|
2020-07-31 17:17:55 +08:00 |
altair
|
00d93db9a0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-31 16:43:53 +08:00 |
altair
|
10f2b6b5d0
|
修改道具名称
|
2020-07-31 16:43:44 +08:00 |