Commit Graph

3642 Commits (579f2806c31ac566411902401b3f9fbe3a810831)

Author SHA1 Message Date
jiaoyangna 579f2806c3 竞技守卫名字修改提交
(cherry picked from commit d3efa809d8)
2021-03-12 16:35:55 +08:00
jiaoyangna fa64d90f08 社稷大点领取奖励后宝箱状态修改
(cherry picked from commit 7fe83b0cea)
2021-03-12 15:55:57 +08:00
jiaoyangna 5be52f6b33 限时活动提交
(cherry picked from commit e3460c8b83)
2021-03-12 15:48:29 +08:00
jiaoyangna 7b5cc295e8 文字提交 2021-03-12 14:32:45 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna dd706075d2 Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
2021-03-12 14:30:10 +08:00
jiaoyangna 8430af12af 文字提交 2021-03-12 14:24:41 +08:00
jiaoyangna 1cd3d4cdaa 文字提交 2021-03-12 14:20:14 +08:00
jiaoyangna decb1e6ff0 图片提交 2021-03-12 14:13:42 +08:00
jiaoyangna 2a6a2e69da 图片提交,巅峰赛竞技守卫名字提交 2021-03-12 12:08:24 +08:00
jiaoyangna 5acc67ead5 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-12 11:11:25 +08:00
jiaoyangna a018c485c0 哪吒修改提交 2021-03-12 11:11:14 +08:00
wangzhenxing 491a6f311a [战斗]========= buff 叠层表现修改 2021-03-12 11:04:06 +08:00
jiaoyangna 04ab1e5451 社稷大典奖励领取提交 2021-03-12 10:32:32 +08:00
ZhangBiao b926310982 【大闹天宫】死亡神将可以一键上阵,并且进入战斗页直接显示(败) 2021-03-11 15:05:38 +08:00
ZhangBiao 9b30532bda 【图鉴】十星神将图鉴等级显示错误 2021-03-11 14:32:08 +08:00
ZhangBiao 1e2dc32804 【列表打开动画】森罗幻境选择神将界面,每选中一个头像都会播一遍动画 2021-03-11 14:28:44 +08:00
jiaoyangna 292069ba5d 活动提交 2021-03-11 10:59:49 +08:00
ZhangBiao 4631f663a8 【本地化】魂灵宝处需要修改 2021-03-11 10:41:34 +08:00
ZhangBiao fbe4e36c95 【鸿蒙阵】加速冷却,妖精不足时提示不足,领取妖精后依然提示不足,重登正常 2021-03-11 10:21:48 +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
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 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 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 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