ZhangBiao
|
4631f663a8
|
【本地化】魂灵宝处需要修改
|
2021-03-11 10:41:34 +08:00 |
ZhangBiao
|
fbe4e36c95
|
【鸿蒙阵】加速冷却,妖精不足时提示不足,领取妖精后依然提示不足,重登正常
|
2021-03-11 10:21:48 +08:00 |
zhangqiang
|
53e0bc02a1
|
【资源导入】0001头像立绘
|
2021-03-11 09:40:12 +08:00 |
ZhangBiao
|
867dcf5007
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-10 18:35:38 +08:00 |
ZhangBiao
|
884abb765d
|
【车迟斗法】修改
|
2021-03-10 18:35:14 +08:00 |
zhangqiang
|
a0e14a4126
|
【卡牌资源】提交
|
2021-03-10 18:20:37 +08:00 |
gaoxin
|
2e6cfc3232
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-10 18:11:32 +08:00 |
gaoxin
|
17a9108b01
|
【网络】修复断开连接接口参数错误
|
2021-03-10 18:11:27 +08:00 |
ZhangBiao
|
4a3b79fce7
|
【锻器阁】添加材料图标不对称
|
2021-03-10 17:57:19 +08:00 |
zhangqiang
|
d8e37cdc66
|
【大闹天宫前端合并修改提交】
|
2021-03-10 17:44:56 +08:00 |
zhangqiang
|
88d1464fb3
|
【大闹天宫前端修改提交】
|
2021-03-10 17:42:17 +08:00 |
zhangqiang
|
0ba3ebb44d
|
【大闹天宫修改】前端圣物战力 商店节点加妖晶显示
|
2021-03-10 17:33:13 +08:00 |
ZhangBiao
|
4fe58e9145
|
【鸿蒙阵】删了空行 bug没复现
|
2021-03-10 17:29:31 +08:00 |
gaoxin
|
06f54f15b3
|
【配置】兼容老包
|
2021-03-10 14:56:53 +08:00 |
jiaoyangna
|
b92d4f01e2
|
wrap 提交
|
2021-03-10 14:16:02 +08:00 |
jiaoyangna
|
4121f24a27
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2021-03-10 13:50:38 +08:00 |
gaoxin
|
ee6fde0370
|
【策划场景】修改战斗中立绘的配置方式
|
2021-03-10 11:53:07 +08:00 |
gaoxin
|
3daf6a11b3
|
【本地化】青龙秘宝活动时间显示优化
|
2021-03-10 11:19:20 +08:00 |
gaoxin
|
e3bc4ecfe0
|
【本地化】修复升级重复显示lv文字
|
2021-03-10 11:04:46 +08:00 |
wangzhenxing
|
ca62c6f377
|
Merge branch '0功能/本周版本优化内容_battle' into 0功能/本周版本优化内容
|
2021-03-10 10:30:47 +08:00 |
gaoxin
|
e725a887a9
|
【bug】修复公告界面显示错误
|
2021-03-09 18:31:19 +08:00 |
ZhangBiao
|
03de42eb51
|
【首领来袭】判断关卡类型
|
2021-03-09 17:19:00 +08:00 |
wangzhenxing
|
1b64251cbd
|
Merge branch '0功能/本周版本优化内容' into 0功能/本周版本优化内容_battle
|
2021-03-09 17:13:33 +08:00 |
JieLing
|
f0a85ff774
|
【hotfix】打包配置提交
|
2021-03-09 16:05:33 +08:00 |
JieLing
|
abd4028923
|
【meta】打包后meta文件上传
|
2021-03-09 16:04:18 +08:00 |
wangzhenxing
|
a2b96970cc
|
【战斗】=========打闹天宫获取英雄模板数据修改,改为全从 heroconfig 表获取
|
2021-03-09 15:48:28 +08:00 |
gaoxin
|
9aa87b54e2
|
【本地化】资源替换
|
2021-03-09 15:44:44 +08:00 |
gaoxin
|
460479779e
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-09 15:39:46 +08:00 |
gaoxin
|
13fbabf125
|
【bug】修复老包中文字重叠
|
2021-03-09 15:39:42 +08:00 |
ZhangBiao
|
cdc8d468cb
|
【灵兽界面】文字问题
|
2021-03-09 15:34:29 +08:00 |
gaoxin
|
d2940b5a18
|
【bug】修复排行榜分页 数据刷新后会导致页面回到最上方
|
2021-03-09 15:18:27 +08:00 |
gaoxin
|
141e60d493
|
【本地化】修复灵兽装备按钮默认显示英文的问题
|
2021-03-09 15:00:59 +08:00 |
jiaoyangna
|
5bd35da17c
|
Revert "图片整理提交"
This reverts commit 988b881285 .
|
2021-03-09 14:37:14 +08:00 |
jiaoyangna
|
0b5afbc4ea
|
Revert "删除 有_zh的图片的 没有加后缀的 图片"
This reverts commit 72998061d8 .
|
2021-03-09 14:36:27 +08:00 |
jiaoyangna
|
64062ba3cf
|
Revert "图片提交"
This reverts commit 6418f1280d .
|
2021-03-09 14:36:20 +08:00 |
jiaoyangna
|
6418f1280d
|
图片提交
|
2021-03-09 14:18:15 +08:00 |
jiaoyangna
|
72998061d8
|
删除 有_zh的图片的 没有加后缀的 图片
|
2021-03-09 14:08:19 +08:00 |
jiaoyangna
|
988b881285
|
图片整理提交
|
2021-03-09 12:44:53 +08:00 |
jiaoyangna
|
d2d0f04d58
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-09 12:13:24 +08:00 |
jiaoyangna
|
bdba95c160
|
添加整理资源
|
2021-03-09 12:03:53 +08:00 |
JieLing
|
5eef06e043
|
【bug】修复老包报错
|
2021-03-08 22:33:04 +08:00 |
JieLing
|
4cac839360
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-08 22:17:15 +08:00 |
JieLing
|
5d149e54fa
|
【bug】修复老包报错
|
2021-03-08 22:17:00 +08:00 |
ZhangBiao
|
ce7a9abe08
|
【大闹天宫】招募节点回滚
|
2021-03-08 20:40:55 +08:00 |
gaoxin
|
88c5fa7a02
|
【本地化】老包设置界面删除多余显示
|
2021-03-08 18:20:47 +08:00 |
wangzhenxing
|
b67d6485c9
|
[战斗]==============249修改
|
2021-03-08 18:07:13 +08:00 |
gaoxin
|
097d754111
|
【本地化】新增资源
|
2021-03-08 17:27:45 +08:00 |
gaoxin
|
6d7c2c0a25
|
【本地化】图片资源压缩
|
2021-03-08 16:53:16 +08:00 |
gaoxin
|
766ba304ed
|
【本地化】法宝回收提示文本翻译,神将装备界面对比套装属性翻译,轩辕宝镜充值界面文本显示调整
|
2021-03-08 16:51:13 +08:00 |
gaoxin
|
c67d5d4d3f
|
【bug】修复本地化导致其他语言支付不成功
|
2021-03-08 16:19:12 +08:00 |