ZhangBiao
|
0ad52a3855
|
活动暂时关闭
|
2020-07-24 13:39:02 +08:00 |
zhangqiang
|
42959d0257
|
编队bug
|
2020-07-24 11:05:40 +08:00 |
zhangqiang
|
3588a17c00
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# data_execl/base_data/UIConfig.xlsx
|
2020-07-23 21:24:00 +08:00 |
zhangqiang
|
688662836a
|
修改
|
2020-07-23 21:18:46 +08:00 |
zhangqiang
|
6a855cf7a2
|
巅峰赛问题修改
|
2020-07-23 20:39:21 +08:00 |
ZhangBiao
|
c268538c0e
|
共鸣资源替换
|
2020-07-23 19:46:54 +08:00 |
zhangqiang
|
94684153c3
|
回放三局两胜显示
|
2020-07-23 18:06:55 +08:00 |
ZhangBiao
|
e0d156ad74
|
森罗英雄全部死亡战斗报错
|
2020-07-23 17:42:17 +08:00 |
ZhangBiao
|
7fb5ac778f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:44:51 +08:00 |
ZhangBiao
|
9b290c1ed5
|
图片资源替换
|
2020-07-23 15:44:40 +08:00 |
jiaoyangna
|
aefa2b0cac
|
添加一个万象境的入口列表
|
2020-07-23 15:42:42 +08:00 |
zhangqiang
|
b53907dda2
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-07-23 11:10:19 +08:00 |
zhangqiang
|
f844305e0e
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
|
2020-07-22 21:55:01 +08:00 |
jiaoyangna
|
cafa630185
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2020-07-22 20:19:57 +08:00 |
jiaoyangna
|
ba8b5a3c93
|
【宝物合成】一键合成预览处显示错误
|
2020-07-22 15:50:18 +08:00 |
ZhangBiao
|
a07830ea52
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 14:36:54 +08:00 |
ZhangBiao
|
9f9f430976
|
道具标签不对应修改
|
2020-07-21 14:36:15 +08:00 |
jiaoyangna
|
9b7e47aaef
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# data_execl/base_data/RaceTowerConfig.xlsx
|
2020-07-20 20:00:31 +08:00 |
gaoxin
|
02b37b2d67
|
Merge branch 'master_develop' into master_test
|
2020-07-20 19:58:43 +08:00 |
jiaoyangna
|
04e9a24db0
|
xuanyuanmirror tijiao
|
2020-07-20 19:46:08 +08:00 |
zhangqiang
|
99f885ac22
|
竞技场宝箱奖励位置可配
|
2020-07-20 16:01:16 +08:00 |
zhangqiang
|
a325bfb781
|
竞技场排名
|
2020-07-20 15:34:30 +08:00 |
zhangqiang
|
c471a9ccd5
|
竞技场替换宝箱效果图替换
|
2020-07-20 11:28:19 +08:00 |
jiaoyangna
|
b11c108e5d
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
|
2020-07-20 09:47:28 +08:00 |
zhangqiang
|
a8427d034c
|
字体修改
|
2020-07-17 19:48:25 +08:00 |
zhangqiang
|
57981fc393
|
字体修改
|
2020-07-17 19:36:23 +08:00 |
JieLing
|
29fc6f99eb
|
Merge branch 'master_develop' into master_test
|
2020-07-17 17:00:55 +08:00 |
zhangqiang
|
6e59d44e5a
|
先屏蔽宝器一键合成
|
2020-07-17 16:40:38 +08:00 |
JieLing
|
c46047fe2c
|
Merge branch 'master_develop' into master_test
# Conflicts:
# data_execl/base_data/GuideConfig.xlsx
|
2020-07-17 16:13:04 +08:00 |
ZhangBiao
|
2db96229ca
|
战斗跳过按钮大小调整
|
2020-07-17 16:05:39 +08:00 |
ZhangBiao
|
b20e5e2f54
|
十绝阵伤害显示调整
|
2020-07-17 14:40:33 +08:00 |
ZhangBiao
|
058d079190
|
18岁
|
2020-07-17 13:58:22 +08:00 |
ZhangBiao
|
63b8b36a37
|
剔除logo等信息
|
2020-07-17 13:38:02 +08:00 |
ZhangBiao
|
3231f857af
|
工会祭祀援助红点、十绝阵排行修改
|
2020-07-16 20:53:17 +08:00 |
jiaoyangna
|
1838823c37
|
幸运探宝提交
|
2020-07-16 20:24:28 +08:00 |
JieLing
|
2be4cc20e6
|
Merge branch 'master_develop' into master_test
# Conflicts:
# .gitignore
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# data_execl/base_data/CombatControl.xlsx
# data_execl/base_data/GuideConfig.xlsx
|
2020-07-16 20:08:11 +08:00 |
ZhangBiao
|
e36a85bcb2
|
充点小钱资源替换
|
2020-07-16 18:17:27 +08:00 |
ZhangBiao
|
0ee5c9dabe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 17:00:06 +08:00 |
ZhangBiao
|
cb56ec6b22
|
森罗小游戏bug修改
|
2020-07-16 16:59:46 +08:00 |
zhangqiang
|
864e3b739d
|
首冲
|
2020-07-16 16:57:36 +08:00 |
zhangqiang
|
1aa78a2dd7
|
戴峰提交
|
2020-07-16 15:52:19 +08:00 |
zhangqiang
|
85663ecfb4
|
首冲
|
2020-07-16 15:02:38 +08:00 |
ZhangBiao
|
afa02aae2e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 13:45:50 +08:00 |
ZhangBiao
|
9d47ce9767
|
小游戏bug修复
|
2020-07-16 13:45:07 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
ZhangBiao
|
18c189cd0c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 16:36:52 +08:00 |
ZhangBiao
|
de9290e4a0
|
物品掉落特效+跳过按钮
|
2020-07-15 16:35:51 +08:00 |
jiaoyangna
|
e15bf9a7b2
|
轩辕宝镜资源提交
|
2020-07-15 16:27:58 +08:00 |
ZhangBiao
|
9497cfae78
|
bug修改
|
2020-07-15 15:03:23 +08:00 |
ZhangBiao
|
9e23f56e00
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 13:41:44 +08:00 |