gaoxin
|
df08c8c159
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 16:22:04 +08:00 |
lihaiyang
|
ce27636de3
|
破阵诛仙累充
破阵诛仙任务
破阵诛仙限时商市
破阵诛仙珍奇宝阁
修改为开服第二周开启,暂时跟随前面的配置
戒灵秘宝
戒灵秘宝
配置为22号开启
|
2020-08-25 00:36:17 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
ZhangBiao
|
7ce2e1423a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-20 18:07:59 +08:00 |
ZhangBiao
|
84a0618197
|
珍奇宝阁,限时商市,累计充值 表格提交
|
2020-08-20 18:07:07 +08:00 |
jiaoyangna
|
948f47398c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 17:36:31 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
ZhangBiao
|
ac6a587466
|
|
2020-08-20 17:04:34 +08:00 |
ZhangBiao
|
32eadd13ef
|
试炼
|
2020-08-19 17:18:38 +08:00 |
ZhangBiao
|
2f6042154b
|
|
2020-08-19 10:16:52 +08:00 |
ZhangBiao
|
8bad66a6c3
|
|
2020-08-18 10:50:09 +08:00 |
liujiaqi
|
803a7f4797
|
开探索达人
|
2020-08-17 15:48:05 +08:00 |
liujiaqi
|
9b6277f8fe
|
极速达人
|
2020-08-17 14:38:14 +08:00 |
liujiaqi
|
0734888ef5
|
极速达人时间修改
|
2020-08-14 20:57:12 +08:00 |
lihaiyang
|
8e438f9d20
|
开启时间修正
周一开启妖灵宝境;
周二开启佛禅宝境;
周三开启人杰宝境;
周四开启道玄宝境;
周五开启妖灵宝境和人杰宝境;
周六开启佛禅宝境和道玄宝境;
周日开启所有四种宝境。
|
2020-08-14 17:11:58 +08:00 |
shihongyi
|
768ea83f23
|
塔战力
|
2020-08-14 14:09:04 +08:00 |
liujiaqi
|
8366d5d54e
|
大小经验金币包矿镐,矿镐包,一键购买
|
2020-08-14 11:16:18 +08:00 |
shihongyi
|
acd9da4f15
|
暂时开启云梦祈福
|
2020-08-14 10:46:55 +08:00 |
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 |
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 |
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 |