jiaoyangna
|
59204790d2
|
xuanyuan commit
|
2020-08-26 10:58:41 +08:00 |
JieLing
|
abd9e6b65a
|
好友切磋添加结果显示
|
2020-08-25 20:28:32 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
zhangqiang
|
1efd100e31
|
奖励弹窗路径修改 公会副本选择框修改
|
2020-08-25 15:39:57 +08:00 |
ZhangBiao
|
e3b872d31a
|
元-》$
|
2020-08-25 14:37:28 +08:00 |
JieLing
|
6c1452fa51
|
创建角色界面资源修改,修复打包后引导消失的问题
|
2020-08-25 11:53:25 +08:00 |
ZhangBiao
|
6f182e075a
|
天宫秘宝 解锁额外奖励文字提示修改,提示”置换玉不足“
|
2020-08-25 10:05:15 +08:00 |
ZhangBiao
|
1382118441
|
成就点击进入是青龙 问题修复
|
2020-08-24 21:09:36 +08:00 |
ZhangBiao
|
d02a997cb0
|
天宫秘宝额外奖励界面
|
2020-08-24 20:37:41 +08:00 |
jiaoyangna
|
1ad1aaa2d4
|
qinglong update
|
2020-08-24 19:45:18 +08:00 |
ZhangBiao
|
52195c17ea
|
天宫秘宝标题修改
|
2020-08-24 18:24:42 +08:00 |
zhangqiang
|
3a209ba629
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 16:31:34 +08:00 |
zhangqiang
|
b36ebe510c
|
修改宝物分解
|
2020-08-24 16:29:27 +08:00 |
ZhangBiao
|
4b59561b3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
|
2020-08-24 16:08:01 +08:00 |
ZhangBiao
|
6013365ad1
|
剑影仙踪特效更新
|
2020-08-24 16:07:08 +08:00 |
gaoxin
|
d7c34ec63d
|
创建角色界面立绘位置调整
|
2020-08-24 16:03:21 +08:00 |
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
|
36d96dcd84
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 15:20:13 +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 |
zhangqiang
|
6deae3c54c
|
公会副本次数修改 送神祠修改bug
|
2020-08-24 13:59:08 +08:00 |
jiaoyangna
|
cf0747566b
|
qinglong commit
|
2020-08-22 21:28:44 +08:00 |
jiaoyangna
|
4604d95f9d
|
qinglong commit
|
2020-08-22 21:20:12 +08:00 |
jiaoyangna
|
adff7af35a
|
qinglong commit
|
2020-08-22 20:22:30 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +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
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +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 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +08:00 |
ZhangBiao
|
4ef8870c4d
|
试炼副本改到了一半
(cherry picked from commit 4e442c7614a669cee38e731edf627b2582b2547b)
|
2020-08-18 10:45:59 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
jiaoyangna
|
a9ebd162ec
|
轩辕 提交
|
2020-08-12 21:10:36 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
zhangqiang
|
22ad34291b
|
献祭 和 吞卡 掉落身上装备不显示提交
|
2020-08-10 14:16:48 +08:00 |
zhangqiang
|
a417e88b0b
|
恭送编队不检测大门闹天宫 and 车迟斗法失败刷新顺序修改
|
2020-08-10 11:30:27 +08:00 |
zhangqiang
|
cca8355c33
|
神将合成提交
|
2020-08-10 11:28:25 +08:00 |
zhangqiang
|
7749211534
|
合成修改
|
2020-08-08 19:27:10 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
ZhangBiao
|
3522da8a3a
|
森罗去除遮罩
|
2020-08-06 15:05:33 +08:00 |
zhangqiang
|
3bb0906865
|
法宝归元中文表
|
2020-08-06 10:38:55 +08:00 |
zhangqiang
|
0a37b3cb11
|
法宝回归协议提交
|
2020-08-07 12:41:35 +08:00 |
ZhangBiao
|
879331e416
|
森罗炸弹数量刷新,奖励和generalpanel界面适配
|
2020-08-05 18:02:47 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +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 |
ZhangBiao
|
ade7ee88bc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 16:19:06 +08:00 |
ZhangBiao
|
24381aba57
|
森罗bug修复
|
2020-08-04 16:18:48 +08:00 |
zhangqiang
|
e11b5fd7bb
|
寻宝红点修改 添加解锁新章节音效
|
2020-08-04 15:33:44 +08:00 |