jiaoyangna
|
aebf37e150
|
云梦祈福提交
|
2020-08-22 20:26:11 +08:00 |
zhangqiang
|
fe00d8726a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 20:25:28 +08:00 |
zhangqiang
|
028761ebaf
|
打开暴力输出
|
2020-08-22 20:25:12 +08:00 |
jiaoyangna
|
adff7af35a
|
qinglong commit
|
2020-08-22 20:22:30 +08:00 |
jiaoyangna
|
4477c38a25
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 19:40:19 +08:00 |
jiaoyangna
|
056815a8b6
|
patch commit
|
2020-08-22 19:40:14 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
zhangqiang
|
ead1ba8fd9
|
提交
|
2020-08-22 19:08:50 +08:00 |
zhangqiang
|
44a2538eb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2020-08-22 18:06:08 +08:00 |
zhangqiang
|
8f72af20cc
|
公会副本提交 达人排行修改
|
2020-08-22 18:03:43 +08:00 |
jiaoyangna
|
dba4206ecc
|
eightday update
|
2020-08-22 17:43:19 +08:00 |
jiaoyangna
|
1622dcff32
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:37:04 +08:00 |
jiaoyangna
|
04bf990060
|
qinglong tijiao
|
2020-08-22 17:36:57 +08:00 |
ZhangBiao
|
be23f0c38a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:05:53 +08:00 |
ZhangBiao
|
8de86ce4ac
|
无尽副本入口
|
2020-08-22 17:05:37 +08:00 |
gaoxin
|
f2ae18778c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:02:48 +08:00 |
jiaoyangna
|
f814a80eb4
|
time update
|
2020-08-22 16:55:27 +08:00 |
jiaoyangna
|
c27d43ba2d
|
qinglong update
|
2020-08-22 16:49:12 +08:00 |
jiaoyangna
|
69a5b9b519
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
|
2020-08-22 16:46:17 +08:00 |
lihaiyang
|
a5f15a4861
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 00:39:20 +08:00 |
lihaiyang
|
ce27636de3
|
破阵诛仙累充
破阵诛仙任务
破阵诛仙限时商市
破阵诛仙珍奇宝阁
修改为开服第二周开启,暂时跟随前面的配置
戒灵秘宝
戒灵秘宝
配置为22号开启
|
2020-08-25 00:36:17 +08:00 |
jiaoyangna
|
fa6bdeeb6a
|
huoqu huodongzhuangtai tijiao
|
2020-08-22 16:43:39 +08:00 |
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 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
jiaoyangna
|
3a16bedd0d
|
qinglong update
|
2020-08-22 15:48:01 +08:00 |
jiaoyangna
|
9395df5406
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 15:43:53 +08:00 |
jiaoyangna
|
f0f8a5d69e
|
qinglong update
|
2020-08-22 15:42:07 +08:00 |
jiaoyangna
|
98e9b9757e
|
huodong commit
|
2020-08-29 13:46:08 +08:00 |
zhangqiang
|
9aec7d16e8
|
公会副本提交
|
2020-08-22 15:34:02 +08:00 |
zhangqiang
|
e1b223e83f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/PrivilegeTypeConfig.xlsx
# data_execl/base_data/RewardGroup.xlsx
# data_execl/base_data/RewardItemConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
# data_execl/base_data/StoreConfig.xlsx
# data_execl/base_data/UIConfig.xlsx
|
2020-08-22 13:59:35 +08:00 |
zhangqiang
|
b279baaa41
|
公会副本提交
|
2020-08-22 13:49:47 +08:00 |
ZhangBiao
|
8391f5638f
|
破阵诛仙 通天教主替换资源
|
2020-08-22 10:20:41 +08:00 |
ZhangBiao
|
7f0d404e5d
|
添加一键购买、礼包界面计时器销毁
|
2020-08-22 10:09:30 +08:00 |
ZhangBiao
|
1a826a3f3e
|
累计充值
|
2020-08-21 20:11:24 +08:00 |
zhangqiang
|
4ed5ba896a
|
公会副本号角
|
2020-08-21 19:09:33 +08:00 |
ZhangBiao
|
52dda5ff47
|
青龙入口 破阵长度
|
2020-08-21 19:03:41 +08:00 |
ZhangBiao
|
3530600553
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:56:12 +08:00 |
jiaoyangna
|
cbd8b9c084
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 18:33:09 +08:00 |
jiaoyangna
|
2646f9418a
|
|
2020-08-28 18:32:59 +08:00 |
jiaoyangna
|
7592690072
|
|
2020-08-28 18:07:50 +08:00 |
jiaoyangna
|
b9cc475e6d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 17:47:02 +08:00 |
jiaoyangna
|
8c17479fd6
|
破阵诛仙活动 调整
|
2020-08-28 17:46:07 +08:00 |
jiaoyangna
|
14e58ae443
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 16:37:01 +08:00 |
jiaoyangna
|
3bb8e284d9
|
破阵诛仙
|
2020-08-28 16:36:08 +08:00 |
jiaoyangna
|
66556e506a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 11:33:24 +08:00 |
jiaoyangna
|
22de98dc18
|
commit
|
2020-08-28 11:31:38 +08:00 |
jiaoyangna
|
e4a9c5c614
|
qinglong update
|
2020-08-28 11:05:31 +08:00 |
ZhangBiao
|
baaee2e547
|
|
2020-08-21 18:56:00 +08:00 |
ZhangBiao
|
bbe2c8c1f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:30:50 +08:00 |
ZhangBiao
|
7058d73193
|
破阵诛仙 提交
|
2020-08-21 18:30:44 +08:00 |