gaoxin
|
e806410e8a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-24 15:25:23 +08:00 |
ZhangBiao
|
939fa0227a
|
无尽入口例会、化虚进入修复、剪影仙踪
|
2020-08-24 15:20:00 +08:00 |
gaoxin
|
395c41ef79
|
Merge branch 'temp' into master_develop
|
2020-08-24 14:36:54 +08:00 |
jiaoyangna
|
aebf37e150
|
云梦祈福提交
|
2020-08-22 20:26:11 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
zhangqiang
|
8f72af20cc
|
公会副本提交 达人排行修改
|
2020-08-22 18:03:43 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +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
|
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 |
jiaoyangna
|
8c17479fd6
|
破阵诛仙活动 调整
|
2020-08-28 17:46:07 +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 |
ZhangBiao
|
7058d73193
|
破阵诛仙 提交
|
2020-08-21 18:30:44 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
zhangqiang
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +08:00 |
ZhangBiao
|
aa551923b1
|
破阵诛仙 珍奇宝阁
|
2020-08-20 18:32:14 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
jiaoyangna
|
6c52db4ec6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 16:08:18 +08:00 |
jiaoyangna
|
2eaa10cdbc
|
添加红点
|
2020-08-20 16:08:12 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
jiaoyangna
|
f439a78b34
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-19 10:05:09 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
f18973cea9
|
极速达人修改
|
2020-08-18 19:17:20 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +08:00 |
jiaoyangna
|
17524007d7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 15:18:03 +08:00 |
jiaoyangna
|
0210dc3109
|
conflict commit
|
2020-08-17 15:17:58 +08:00 |
ZhangBiao
|
77b3386efb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 11:57:01 +08:00 |
ZhangBiao
|
c2fdcb06bd
|
极速达人
|
2020-08-17 11:56:38 +08:00 |
zhangqiang
|
6df142b067
|
修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏
|
2020-08-17 11:39:41 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
jiaoyangna
|
fbf7c3b41d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:44:53 +08:00 |
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
jiaoyangna
|
95dff6f0e9
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-08-12 14:20:45 +08:00 |
ZhangBiao
|
06bc9c1f1d
|
Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-12 14:15:27 +08:00 |
ZhangBiao
|
ed319be87e
|
神将置换
|
2020-08-12 14:13:16 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +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 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
jiaoyangna
|
5c13a25bb5
|
encoding convert
|
2020-08-06 17:37:42 +08:00 |
jiaoyangna
|
22b02b5cca
|
encoding convert
|
2020-08-06 17:35:07 +08:00 |
ZhangBiao
|
44497f73bd
|
神将置换页面制作1
|
2020-08-06 10:43:11 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |