jiaoyangna
|
767541c1a6
|
编队界面皮肤位置修改
|
2020-11-06 14:30:44 +08:00 |
jiaoyangna
|
360727419e
|
【皮肤】修改皮肤显示
|
2020-11-04 16:51:45 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
jiaoyangna
|
49e94e9204
|
森罗幻境动画删除
|
2020-10-12 14:00:55 +08:00 |
jiaoyangna
|
c7836b8aea
|
编队界面修改提交
|
2020-09-28 21:08:12 +08:00 |
jiaoyangna
|
6f0b87c858
|
轩辕适配修改,文字颜色修改
|
2020-09-28 16:56:22 +08:00 |
jiaoyangna
|
74d675ee95
|
Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test
|
2020-09-28 16:33:21 +08:00 |
jiaoyangna
|
9875595535
|
添加进入轩辕宝镜编队界面的逻辑
|
2020-09-28 16:32:59 +08:00 |
JieLing
|
39105d8de3
|
轩猿修改
|
2020-09-28 15:20:27 +08:00 |
JieLing
|
f4f505eb6c
|
轩辕提示修改提交
|
2020-09-28 15:16:49 +08:00 |
gaoxin
|
b3067cca48
|
修复切磋战斗结果只会显示失败的问题
|
2020-09-21 16:39:59 +08:00 |
ZhangBiao
|
f6fde7a2c8
|
试炼副本增加动效
|
2020-09-04 18:04:54 +08:00 |
zhangqiang
|
1c59eb5ff4
|
编队提示文字适配
|
2020-09-04 11:33:33 +08:00 |
zhangqiang
|
ca67dc9457
|
louti
|
2020-09-03 16:45:40 +08:00 |
zhangqiang
|
8827fccbaf
|
去掉编队索引赋值
|
2020-09-03 16:43:08 +08:00 |
zhangqiang
|
352f338abe
|
界面战力不一致
|
2020-09-03 16:03:14 +08:00 |
ZhangBiao
|
e3e95e2379
|
森罗 无尽 流程优化和界面调整
|
2020-09-02 13:35:29 +08:00 |
zhangqiang
|
946aaa36ea
|
处理神将归元 无尽和大闹天宫一级上阵问题 神将置换大闹天宫编队没血量问题
|
2020-08-31 15:54:12 +08:00 |
ZhangBiao
|
a99aa6ef6e
|
还是红点检测
|
2020-08-28 17:29:38 +08:00 |
ZhangBiao
|
0c3b0e6326
|
车迟斗法副本界面红点
|
2020-08-28 16:35:08 +08:00 |
gaoxin
|
259e0a1209
|
祈福文字修改
|
2020-08-28 03:12:54 +08:00 |
zhangqiang
|
220a8f216e
|
大闹天宫背景 大闹天宫女例会比例 公会技能更新战力调整位置
|
2020-08-29 16:15:41 +08:00 |
ZhangBiao
|
dc9615b4fc
|
无尽进图武神将问题、取消对话战斗结束神将数据界面
|
2020-08-26 16:22:37 +08:00 |
ZhangBiao
|
0db40d1c9b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:14:37 +08:00 |
ZhangBiao
|
d644b64450
|
删除限时活动中的五行成长礼,试炼副本治疗神将不能一键上阵
|
2020-08-26 15:14:27 +08:00 |
zhangqiang
|
384b3b35c3
|
编队修改
|
2020-08-26 15:00:13 +08:00 |
zhangqiang
|
4bc63fb367
|
编队bug
|
2020-08-26 11:26:32 +08:00 |
JieLing
|
abd9e6b65a
|
好友切磋添加结果显示
|
2020-08-25 20:28:32 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +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 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
ZhangBiao
|
32eadd13ef
|
试炼
|
2020-08-19 17:18:38 +08:00 |
ZhangBiao
|
8f786147d3
|
|
2020-08-18 16:36:24 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +08:00 |
ZhangBiao
|
b0f0b654ec
|
无尽副本已经可以进去了
(cherry picked from commit a1737d6e7014963b19c97ccfb2d1c878d88bc295)
|
2020-08-18 10:48:52 +08:00 |
ZhangBiao
|
9f8b553626
|
试炼副本补日志
(cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492)
|
2020-08-18 10:46:33 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +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 |
jiaoyangna
|
e372c84cdb
|
xuanyuan
|
2020-08-12 13:34:07 +08:00 |
jiaoyangna
|
9f186311b3
|
xuanyuan
|
2020-08-11 15:11:33 +08:00 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
0a8bdc5765
|
援助 十绝阵 合成 提示性bug
|
2020-08-04 14:02:28 +08:00 |
gaoxin
|
70cd06da2b
|
计算战斗力卡顿的问题优化
|
2020-08-03 15:36:29 +08:00 |
gaoxin
|
4c93923b39
|
尝试修复编队和角色装备界面报错的问题
|
2020-07-31 18:24:13 +08:00 |