Commit Graph

5587 Commits (683b48fb0c9e67a5b373507362b3c7ecd2cb5e98)

Author SHA1 Message Date
wangzhenxing 683b48fb0c 玉虚论道提交 2021-09-11 18:53:58 +08:00
wangzhenxing d9214666c2 玉虚论道回放优化 2021-09-11 16:00:39 +08:00
wangzhenxing 4b5c55a1ab qqq 2021-09-11 15:05:37 +08:00
wangzhenxing cbb088a491 他人队伍灵兽修改 2021-09-10 22:13:48 +08:00
wangzhenxing 489f6f7e37 编对拖动英雄保存队伍修改 2021-09-10 21:34:45 +08:00
wangzhenxing 16289857a5 aaaa 2021-09-10 18:21:04 +08:00
gaoxin 5af9e9f0ed 【编队】修复报错 2021-09-10 17:30:26 +08:00
gaoxin f7d1601c79 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
2021-09-10 16:26:34 +08:00
gaoxin 16633b37a8 【编队优化】 2021-09-10 16:25:38 +08:00
wangzhenxing e2f7284507 qqqq 2021-09-10 15:50:24 +08:00
wangzhenxing 3257b89e70 eeeeeeee 2021-09-09 23:01:23 +08:00
wangzhenxing 159f2e2494 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua
2021-09-09 20:37:53 +08:00
wangzhenxing a1c21eb441 qqqqq 2021-09-09 20:32:02 +08:00
gaoxin 8bb679214b 【玉虚】QA提示添加 2021-09-09 19:21:50 +08:00
gaoxin ed1f153fa1 【玉虚】挑战界面动画添加,优化界面显示,挑战完成后关闭界面时刷新挑战列表 2021-09-09 18:04:56 +08:00
wangzhenxing 48e25d05e7 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 16:47:34 +08:00
wangzhenxing 21a222cb27 aaaaaaaa 2021-09-09 16:47:18 +08:00
gaoxin 1094c3678a Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 16:40:34 +08:00
gaoxin b29d7b43fe 【玉虚】每日挑战奖励显示优化 2021-09-09 16:40:29 +08:00
wangzhenxing ea457002be Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 16:27:53 +08:00
wangzhenxing c27379226c aaaaaaaaaaaaa 2021-09-09 16:27:36 +08:00
gaoxin b1c987b16f 【玉虚】界面显示优化,星星显示优化 2021-09-09 16:22:35 +08:00
wangzhenxing 49a7a2b242 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 15:44:33 +08:00
wangzhenxing 0d82056bc2 主界面显示修改 2021-09-09 15:44:19 +08:00
gaoxin 065734184e 【玉虚】商店跳转添加 2021-09-09 15:16:41 +08:00
gaoxin 60b842e2ab 【排行榜】报错修复 2021-09-09 14:05:44 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +08:00
wangzhenxing 03b2acbb91 Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-07 18:45:25 +08:00
wangzhenxing c531b3776b 玉虚论道提交 2021-09-07 18:27:23 +08:00
wangzhenxing 5f0bfe53bd 玉虚论道提交 2021-09-07 17:05:46 +08:00
gaoxin 0bd0137a2b 【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
 2、添加用于debug的log
2021-09-07 15:14:10 +08:00
gaoxin 79832f3232 【碎片详情】碎片详情添加灵兽和神将的查看 2021-09-07 11:40:12 +08:00
gaoxin b5ad62620f 【背包】修复滑动后切换页签不回到最顶部的 问题 2021-09-06 19:23:41 +08:00
gaoxin b953fac2a0 【巅峰赛】选拔赛组界面添加角色信息展示 2021-09-06 17:58:31 +08:00
gaoxin 59ec0d6f20 【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题 2021-09-06 16:35:46 +08:00
gaoxin 11495d1076 【山河社稷图】修复奖励界面报错导致卡死 2021-09-06 11:45:30 +08:00
gaoxin 17001dd7d8 【防沉迷】游戏内添加未成年人判断 2021-09-06 11:00:34 +08:00
ZhangBiao 68791a5745 【战力】连续打开变负数修改 2021-09-03 11:10:24 +08:00
ZhangBiao 009a17a25a 【战力】漏提交 2021-09-03 10:19:51 +08:00
ZhangBiao 5ea7acdef7 【幸运探宝】提交 2021-09-02 22:35:44 +08:00
ZhangBiao 72c42eb871 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 22:25:08 +08:00
ZhangBiao 08e8944e47 【战力问题】PVP增减伤引起的战力不统一问题修改 2021-09-02 22:24:58 +08:00
gaoxin 316adf6fbd 【登录】优化登录失败时,界面文字提示 2021-09-02 22:12:58 +08:00
ZhangBiao fbfa80611a 【幸运摊薄】时间显示 2021-09-02 20:58:11 +08:00
ZhangBiao f6d05b433d 【神将属性】本服排行榜查看神将属性,与背包神将情报中属性不一致 2021-09-02 18:07:49 +08:00
gaoxin 45ddf4e09e 【防沉迷】修复切服不生效,添加防沉迷登录提示 2021-09-02 14:27:18 +08:00
ZhangBiao d3f7213de0 【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑 2021-09-02 11:34:15 +08:00
ZhangBiao 6bbf30e344 【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000 2021-09-02 11:19:29 +08:00
ZhangBiao 00bd84f77c 【升星有礼】增加新将例会 2021-09-02 09:57:17 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00