zhangqiang
|
54fa0110e5
|
【山河社稷图】提交
|
2021-05-15 13:49:18 +08:00 |
zhangqiang
|
410f679e68
|
【山河社稷图】提交
|
2021-05-11 16:58:01 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
cf5a2a46fa
|
【本地化】还原文本到代码种
|
2021-04-06 15:23:27 +08:00 |
zhangqiang
|
86a99f3344
|
【无尽副本】一键上阵修改
|
2021-04-02 21:11:37 +08:00 |
zhangqiang
|
aa17c175b7
|
【无尽副本】阵亡神将可以一键上阵
|
2021-04-01 14:05:21 +08:00 |
jiaoyangna
|
d81075da7a
|
还原lua
|
2021-03-02 16:53:12 +08:00 |
jiaoyangna
|
88e59e0c7c
|
lua 提交
|
2021-03-02 15:49:02 +08:00 |
jiaoyangna
|
e4f4649cf9
|
文本提交
|
2021-02-20 18:01:57 +08:00 |
jiaoyangna
|
602dbc924c
|
文本还原
|
2021-02-20 16:43:44 +08:00 |
gaoxin
|
78e7305c15
|
【本地化】导出中文
|
2021-02-05 15:58:37 +08:00 |
gaoxin
|
927025f6de
|
【本地化】中文字还原,合并用
|
2021-02-05 12:44:50 +08:00 |
gaoxin
|
adf591cbec
|
【本地化】lua代码还原
|
2021-01-27 18:16:54 +08:00 |
gaoxin
|
81b3ca1ddc
|
【本地化】 中文字还原,合并代码用
|
2021-01-26 11:13:09 +08:00 |
gaoxin
|
802881378c
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
|
2021-01-26 11:08:54 +08:00 |
gaoxin
|
3b83a72215
|
【本地化】文字还原
|
2021-01-26 11:05:27 +08:00 |
guowei
|
344ec52500
|
【巅峰赛头像修改】
|
2021-01-18 15:07:23 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +08:00 |
ZhangBiao
|
78ead0e8ad
|
【大闹天宫】一键上阵招募英雄
|
2020-12-24 15:13:03 +08:00 |
jiaoyangna
|
0054f5e646
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:37:38 +08:00 |
ZhangBiao
|
2df4f34c76
|
【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
|
2020-11-26 16:09:22 +08:00 |
ZhangBiao
|
d789b9e98e
|
【编队优化】轩辕宝镜一键特殊处理
|
2020-11-19 17:37:13 +08:00 |
ZhangBiao
|
08657b4ffd
|
【编队优化】车迟 十绝 增加一键
|
2020-11-18 10:48:35 +08:00 |
ZhangBiao
|
646e3e8061
|
【编队优化】轩辕宝镜增加一键
|
2020-11-17 20:01:13 +08:00 |
ZhangBiao
|
a68a068746
|
【编队优化】巅峰赛增加一键
|
2020-11-17 19:59:18 +08:00 |
ZhangBiao
|
462484db66
|
【编队优化】竞技场防守编队增加一键
|
2020-11-17 19:57:17 +08:00 |
ZhangBiao
|
c8aa6b5971
|
【编队优化】公会副本增加一键
|
2020-11-17 19:54:02 +08:00 |
ZhangBiao
|
188dc707a9
|
【编队优化】大闹天宫增加一键
|
2020-11-17 19:42:08 +08:00 |
ZhangBiao
|
75c04b2c43
|
【编队优化】心魔试炼增加一键上阵
|
2020-11-17 17:41:06 +08:00 |
ZhangBiao
|
233ff1b361
|
【编队优化】无尽副本增加一键
|
2020-11-17 17:12:52 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
jiaoyangna
|
6f0b87c858
|
轩辕适配修改,文字颜色修改
|
2020-09-28 16:56:22 +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 |
gaoxin
|
259e0a1209
|
祈福文字修改
|
2020-08-28 03:12:54 +08:00 |
ZhangBiao
|
dc9615b4fc
|
无尽进图武神将问题、取消对话战斗结束神将数据界面
|
2020-08-26 16:22:37 +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
|
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 |