Commit Graph

3176 Commits (e9803f2760eec08e269109d7b52e89fd5252fb16)

Author SHA1 Message Date
ZhangBiao e9e002310b 【大闹天宫】 2021-03-18 21:15:03 +08:00
wangzhenxing 6569aaaf08 【假战斗】剧情添加跳过 2021-03-18 20:53:46 +08:00
jiaoyangna c9f20bf928 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 18:36:24 +08:00
jiaoyangna b9c5d93f0f 【每日豪礼】领完不消失 2021-03-18 18:36:21 +08:00
zhangqiang 0ced995afe 【分解魂印提示】分解魂印提示不当(策划说改成,金色或金色以上) 2021-03-18 16:13:47 +08:00
zhangqiang cc9b681875 【碎片】用碎片合成神将点击查看详情有问题 2021-03-18 16:09:44 +08:00
zhangqiang 7a6a0b1451 【贪婪节点修改】 2021-03-18 15:53:44 +08:00
ZhangBiao f704847601 2021-03-18 15:51:14 +08:00
ZhangBiao b1013b0069 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:23:23 +08:00
ZhangBiao 7001e46f6c 2021-03-18 15:23:14 +08:00
zhangqiang 6cb698f147 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:16:13 +08:00
zhangqiang e8acbe1c86 【自选箱提交】 2021-03-18 15:15:54 +08:00
ZhangBiao f8d0c03e63 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:15:32 +08:00
ZhangBiao e8928e062d 【道具自选箱】 2021-03-18 15:15:16 +08:00
gaoxin 115e4aaa18 【红点】成长礼包红点不显示修复 2021-03-18 15:02:13 +08:00
ZhangBiao b479a8fa8b 首领来袭 2021-03-18 14:40:47 +08:00
ZhangBiao db3340d779 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 14:10:29 +08:00
ZhangBiao 97ae8966d7 【充值界面】 2021-03-18 14:10:23 +08:00
gaoxin 5e423f2ebe 【灵兽】灵兽入口随功能状态显隐 2021-03-18 13:36:01 +08:00
gaoxin 69be522af0 【优化】serverconfig打印优化 2021-03-18 12:04:21 +08:00
gaoxin 6246da5bb6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 12:03:57 +08:00
gaoxin 811594ef57 【bug】修复好友列表不能滑动的问题 2021-03-18 12:03:51 +08:00
jiaoyangna f49d2b76f0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 12:01:39 +08:00
jiaoyangna e7803d68c8 逍遥boss 提交 2021-03-18 12:01:35 +08:00
ZhangBiao 63b9348e54 充值界面 2021-03-18 11:31:10 +08:00
jiaoyangna 0209a90c27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 11:13:26 +08:00
jiaoyangna 11a5cf2a99 【首充】孙悟空页面详情天赋显示错误 2021-03-18 11:13:10 +08:00
zhangqiang 88b1230c42 【本地化魂印】专属魂印适用范围不显示 2021-03-18 10:41:54 +08:00
ZhangBiao e26d838851 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:30:29 +08:00
ZhangBiao 2ba7583da3 【中文元修改】 2021-03-18 10:27:36 +08:00
gaoxin 3498c8803b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:16:47 +08:00
gaoxin 4c30b42f61 【bug】修复替换装备时按钮文字错误 2021-03-18 10:16:34 +08:00
ZhangBiao fb7bdbbe29 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:11:10 +08:00
ZhangBiao 8c90b7fe7c 【自选宝箱】 2021-03-18 10:11:00 +08:00
gaoxin 778ed8e886 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:07:08 +08:00
gaoxin 64ee4697f5 【bug】点击替换装备,装备图标跟穿戴着的图标一样 2021-03-18 10:07:03 +08:00
jiaoyangna 4715c7d469 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 20:43:50 +08:00
jiaoyangna 9f1f204588 主界面提交 2021-03-17 20:43:47 +08:00
ZhangBiao 1688bd41fb 【八日登录】图片位置修改 2021-03-17 18:01:58 +08:00
JieLing ca3bcb612d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:37:06 +08:00
JieLing 40c0ed6075 【sdk】国内sdk适应修改 2021-03-17 17:36:50 +08:00
jiaoyangna f35e638e22 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:34:20 +08:00
jiaoyangna d6b008742b gm 提交 2021-03-17 17:34:14 +08:00
zhangqiang f2b3df9721 【修改提交】 2021-03-17 17:27:53 +08:00
zhangqiang 6eb9050d4a 【轩辕宝镜】不进版本但是可以通过穿戴界面道具跳转 2021-03-17 17:17:20 +08:00
zhangqiang d5f34e516c 【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉 2021-03-17 16:56:02 +08:00
gaoxin 8cf2670d6b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:54:02 +08:00
gaoxin 80209e4a35 【引导战斗】加入 2021-03-17 16:53:48 +08:00
wangzhenxing 7185fb678f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:46:02 +08:00
wangzhenxing 433a6b243c [战斗]=============被动191修改,buff图标叠加添加免疫和连接符 2021-03-17 16:45:26 +08:00
gaoxin 2db591318f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:45:19 +08:00
gaoxin 6f52e3e338 【bug】统一一键合成时的文字提示 2021-03-17 16:45:13 +08:00
wangzhenxing 7d576d8c0c [战斗]=============被动225修改 增加最大血量客户端特殊处理 2021-03-17 16:43:28 +08:00
jiaoyangna adb3a1e750 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:20:22 +08:00
ZhangBiao c8661ab384 【首领来袭】任务过小修改, 2021-03-17 16:17:41 +08:00
jiaoyangna 5963eb170b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:04:31 +08:00
ZhangBiao b630889891 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:01:02 +08:00
ZhangBiao 17990d0dc8 【自选宝箱】修改 2021-03-17 16:00:52 +08:00
zhangqiang 125a393167 【修bug】 2021-03-17 15:54:45 +08:00
gaoxin aa30b1ed6e 【bug】修复升级神将立即关闭界面,再次打开界面时显示错误 2021-03-17 15:29:23 +08:00
jiaoyangna 95351b5bd1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 15:03:54 +08:00
ZhangBiao 4efb36a195 【八日登陆】资源修改 2021-03-17 14:37:56 +08:00
jiaoyangna 9f2d86c2a1 天书秘卷 2021-03-17 14:29:34 +08:00
jiaoyangna ee30858c07 添加一个红点 2021-03-17 14:20:51 +08:00
jiaoyangna 909ed03c04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 13:33:22 +08:00
ZhangBiao bf3d732b69 【中文本地化】 2021-03-17 12:05:44 +08:00
jiaoyangna 32c239fcb2 活动开启条件提交 2021-03-17 12:02:32 +08:00
jiaoyangna 31b808209e 主界面修改提交 2021-03-17 11:55:02 +08:00
jiaoyangna dfd3c4acc6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 11:54:40 +08:00
ZhangBiao 15dec90220 【本地化】修改 2021-03-17 11:29:43 +08:00
jiaoyangna a7c5bcce1a 主界面修改提交 2021-03-17 11:07:47 +08:00
jiaoyangna 5d89fe2a79 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 10:38:11 +08:00
jiaoyangna 36f4efedc8 主城优化修改 2021-03-17 10:38:07 +08:00
gaoxin 15103f5032 【ios】引导战斗添加 2021-03-17 09:52:50 +08:00
gaoxin 232e7c158a 【优化】优化lateUpdate,修复使用lateupdate报错时会使所有lateupdate失效的问题 2021-03-17 09:52:17 +08:00
jiaoyangna 0cdd115646 Merge branch 'china/dev' into 0功能/天书秘卷 2021-03-16 18:32:52 +08:00
gaoxin ef7130e056 修改首充界面错误 2021-03-16 18:29:25 +08:00
gaoxin c8c81215ce 【图鉴】根据表配置控制显示隐藏 2021-03-16 18:06:57 +08:00
jiaoyangna 3fe1267e86 功能隐藏
(cherry picked from commit 2f2cf25801)
2021-03-16 17:43:59 +08:00
jiaoyangna 2f2cf25801 功能隐藏 2021-03-16 17:43:47 +08:00
jiaoyangna 8ec9b44626 功能不进版本隐藏按钮
(cherry picked from commit 0b538b6e1e)
2021-03-16 17:38:29 +08:00
jiaoyangna 147d358e11 天书密卷 2021-03-16 17:37:32 +08:00
jiaoyangna 0b538b6e1e 功能不进版本隐藏按钮 2021-03-16 17:36:30 +08:00
ZhangBiao e758730d4a 【首领来袭】 2021-03-16 17:25:11 +08:00
ZhangBiao 003d2e8ba5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-16 17:09:35 +08:00
ZhangBiao c2cab749f4 【首领来袭】位置调整 2021-03-16 17:09:18 +08:00
JieLing c945f53946 【修改bug】提交 竞技场 + 试炼奖励优化list重叠 2021-03-16 16:06:55 +08:00
ZhangBiao 6dda93f175 【国内测试】无法登录修复 2021-03-16 15:29:38 +08:00
ZhangBiao 4528e23541 Merge branch 'china/dev' into 0活动开发聚集地/限时神装 2021-03-16 14:49:47 +08:00
jiaoyangna adabb23e0c 灵兽羁绊修改提交 2021-03-16 13:49:32 +08:00
jiaoyangna 27859eec4f 灵兽羁绊修改提交 2021-03-16 11:10:09 +08:00
JieLing 7215433a87 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-16 10:30:37 +08:00
JieLing ab8d5b8a2d 【国内先遣修改】 2021-03-16 10:25:41 +08:00
ZhangBiao d82eb7f88a 【战斗开始过快修复】 2021-03-15 20:35:16 +08:00
ZhangBiao 95080d3da7 2021-03-15 18:38:26 +08:00
ZhangBiao 49701bcbec 【首领来袭】战斗报错修复 2021-03-15 18:37:16 +08:00
ZhangBiao 1b06ae40c9 【battlelogic】增加log 2021-03-15 17:11:52 +08:00
ZhangBiao 86fdb9395b Merge branch '0功能/本周版本优化内容' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
2021-03-15 10:51:17 +08:00
jiaoyangna f48ee539f6 修改提交 2021-03-13 17:37:59 +08:00
ZhangBiao 37e948c9b9 【限时神装】 2021-03-13 15:09:34 +08:00
jiaoyangna b63d62c7f1 文字修改提交 2021-03-13 14:25:25 +08:00
jiaoyangna b260a2d0d8 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 14:22:54 +08:00
jiaoyangna c7860fec99 文字修改提交 2021-03-13 14:22:48 +08:00
ZhangBiao e9cadb6cb9 重登确认框 2021-03-13 14:00:27 +08:00
ZhangBiao 0779a816e0 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 12:57:41 +08:00
ZhangBiao 5334a7c7da 【首领来袭】 2021-03-13 12:57:31 +08:00
jiaoyangna 8656408ac9 宝箱状态修改 2021-03-12 18:18:25 +08:00
jiaoyangna 388f68d39d 鸿蒙提示修改 2021-03-12 17:28:10 +08:00
jiaoyangna 446d9c85ea 添加妖晶不足提示 2021-03-12 17:24:24 +08:00
jiaoyangna 5ed4d34201 合并修改提交 2021-03-12 17:08:51 +08:00
jiaoyangna aa94edf1d7 Merge branch 'xma/dev' into 0功能/本周版本优化内容 2021-03-12 16:41:18 +08:00
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
ZhangBiao 4f326e59e5 【本地化】战力排名弹窗,弹窗中无玩家排名,排名未刷新 2021-03-12 15:10:55 +08:00
ZhangBiao 51c0b51a87 【本地化】魂灵宝处需要修改 2021-03-12 15:07:17 +08:00
jiaoyangna 7b5cc295e8 文字提交 2021-03-12 14:32:45 +08:00
ZhangBiao 8aad1eee56 【限时神装】 2021-03-12 14:31:53 +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 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 24ea537bba Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
2021-03-11 15:15:09 +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
zhangqiang d8e37cdc66 【大闹天宫前端合并修改提交】 2021-03-10 17:44:56 +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
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
wangzhenxing a2b96970cc 【战斗】=========打闹天宫获取英雄模板数据修改,改为全从 heroconfig 表获取 2021-03-09 15:48:28 +08:00
gaoxin 13fbabf125 【bug】修复老包中文字重叠 2021-03-09 15:39:42 +08:00
gaoxin d2940b5a18 【bug】修复排行榜分页 数据刷新后会导致页面回到最上方 2021-03-09 15:18:27 +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 766ba304ed 【本地化】法宝回收提示文本翻译,神将装备界面对比套装属性翻译,轩辕宝镜充值界面文本显示调整 2021-03-08 16:51:13 +08:00
gaoxin c67d5d4d3f 【bug】修复本地化导致其他语言支付不成功 2021-03-08 16:19:12 +08:00
gaoxin 12ecb9f437 【本地化】修复老包找不到Configmgr报错 2021-03-08 11:23:00 +08:00
ZhangBiao 42547ff956 【本地化】八日登陆**问题解决 2021-03-08 11:06:07 +08:00
ZhangBiao 33d6f64785 【本地化】鸿蒙阵结果中文修改 2021-03-08 10:57:57 +08:00
ZhangBiao 9792e57e9b 【系统弹窗】提交 2021-03-05 17:27:57 +08:00
wangzhenxing 130a7d6548 [战斗]=============272被动修改 根据配置回合数开始计算概率 2021-03-05 18:02:31 +09:00
wangzhenxing 74ebe19f74 [战斗]====================大闹天宫圣物修改提交 2021-03-05 16:26:50 +09:00
ZhangBiao 005e54b036 【大闹天宫】招募节点修改 2021-03-05 13:54:19 +08:00
ZhangBiao 9ef30f18bb 【首领来袭】报错修改 2021-03-05 11:00:38 +08:00
guowei e7b2eb579e 【需求】 鸿蒙阵道具数量优化 2021-03-04 18:27:31 +08:00
gaoxin 00bbbea7e9 【网络重连】重连时间超过2分钟强制回到登录界面 2021-03-02 15:58:17 +08:00
wangzhenxing 7e80c71111 [战斗]===========合并local修改的观音追击导致报错 2021-02-27 18:30:11 +09:00
wangzhenxing ab355be37a Merge branch '0功能/本周版本优化内容_battle' into 0功能/本周版本优化内容 2021-02-27 15:26:19 +09:00
zhangqiang e77d73b293 代码错误 2021-02-27 15:19:26 +08:00
wangzhenxing f7d040f29b Merge branch '0功能/本周版本优化内容' into 0功能/本周版本优化内容_battle 2021-02-27 15:14:59 +09:00
zhangqiang 152650dc3f 【ScrollCycleView】修改6 2021-02-26 17:26:45 +08:00
wangzhenxing 0bd2c53e6c 【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻 2021-02-26 18:19:54 +09:00
wangzhenxing 7ae746b318 [战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻 2021-02-26 17:00:05 +09:00
zhangqiang a379a801bb 提交 2021-02-26 15:51:58 +08:00
zhangqiang 25f527f065 【ScrollCycleView】修改5 2021-02-26 14:52:59 +08:00
ZhangBiao 5ea71bdeeb 【首领来袭】相同关卡之谈出一次 2021-02-26 14:26:10 +08:00
ZhangBiao c1b73bdbd9 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-26 14:07:34 +08:00
ZhangBiao fbe63e5ccf 【首领来袭】增加动画 2021-02-26 14:07:22 +08:00
gaoxin 5ccab46809 【bug】修复领取奖励报错的问题 2021-02-26 12:03:53 +08:00
ZhangBiao a3f8b35225 Merge branch '0优化/战斗增加boss详情' into 0功能/本周版本优化内容 2021-02-26 11:04:41 +08:00
ZhangBiao 338ed4d13f 【首领来袭】提交 2021-02-26 11:03:14 +08:00
zhangqiang 545dee3df1 【ScrollCycleView】修改4 2021-02-26 10:37:39 +08:00
gaoxin edec649f64 【bug】修复合成时log信息导致的报错 2021-02-26 10:13:27 +08:00
gaoxin 584431db2e 【bug】修复新将战斗跳过回到新将界面还会播放战斗音效的问题 2021-02-26 10:08:36 +08:00
ZhangBiao 3ddc796ec2 【首领来袭】完成 2021-02-25 21:08:11 +08:00
wangzhenxing 0e23ca3cf8 [战斗]======= 2021-0303发布计划 战斗修改 2021-02-25 19:48:24 +09:00
gaoxin 0babcc640b 【报警】添加用于确认登录成功的接口,后端用于登录监测告警 2021-02-25 14:33:23 +08:00
jiaoyangna fe881897dc Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-25 13:47:09 +08:00
jiaoyangna e709c80428 竞技场修改 2021-02-25 13:47:04 +08:00
zhangqiang 5699b89258 【ScrollCycleView】修改3 2021-02-25 12:04:31 +08:00
zhangqiang 67d0dfa44f 【抽卡奖池】显示问题 2021-02-25 12:00:27 +08:00
jiaoyangna f3cc8413f2 主题活动提交 2021-02-25 10:20:14 +08:00
zhangqiang 39d43b11bc 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变2 2021-02-24 19:48:04 +08:00
zhangqiang d454c3bf08 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变 2021-02-24 16:47:20 +08:00
JieLing 87f5e271e3 【ScrollCycleView】修改2 2021-02-24 15:01:52 +08:00
JieLing cf0e819d73 【优化】scrollview SetData接口默认回到顶部 2021-02-24 14:56:01 +08:00
JieLing 1b77aec298 【bug】修复scrollview修改导致引导报错的问题 2021-02-24 14:53:59 +08:00
gaoxin 4b4049e938 【scrollCycleView】 修改1 2021-02-24 14:32:03 +08:00
zhangqiang ac3fe3f251 【升星界面调整】9升10星,十星位置需调整 2021-02-24 10:53:21 +08:00
zhangqiang dc42a492e7 【排行榜优化】排行榜信息分页读取 2021-02-24 10:13:43 +08:00
zhangqiang 497729e762 【优化】查找合成的时候英雄名字查找困难 英雄名字放在主页上 2021-02-23 20:50:56 +08:00
zhangqiang f7d62a72fc 恭喜获得界面中,道具名称过长的情况,改为显示4个字+省略号的形式显示,参考背包即可 2021-02-23 20:37:57 +08:00
zhangqiang ced93fe8d3 【逍遥游】逍遥游玩法幻魔事件结算会显示之前的金币特效 2021-02-23 16:52:17 +08:00
zhangqiang fb035643fe 【鸿蒙阵】请先解锁前一个共鸣位置 2021-02-23 16:21:42 +08:00
wangzhenxing da1aa31b3d [战斗]=============混乱普攻逻辑修改 2021-02-23 17:03:10 +09:00
zhangqiang e8ee62f9ab 【大闹天宫】重置提示错误 2021-02-23 10:40:58 +08:00
zhangqiang a6ac4320a7 【装备分解】筛选显示的是宝物 2021-02-23 10:00:39 +08:00
ZhangBiao 23f9c2905d 【邮件】背包已满时领取邮件,领取按钮状态变为了删除,返回邮件列表,状态变为已领取(修复) 2021-02-22 21:17:06 +08:00
ZhangBiao c2c712c3f9 【战斗boss详情】UIdata提交 2021-02-22 20:22:26 +08:00
ZhangBiao b994557866 【boss介绍界面】创建提交 2021-02-22 20:19:16 +08:00
ZhangBiao 0382600bb8 【boss详情】战斗中断完成,该创建新界面 2021-02-22 16:59:55 +08:00
JieLing a7bd8323ad 【鸿蒙阵】 红点刷新修改 2021-02-20 21:22:05 +08:00
zhangqiang bf24b8cc51 【鸿蒙阵】330 bug 2021-02-20 17:55:57 +08:00
zhangqiang eaf34d9b6a 【邮件】一键领取红点检测刷新方法添加 2021-02-20 17:05:22 +08:00
guowei 4c03ec543d 【魂宝灵宝 重新初始化数据修改】 2021-02-20 16:45:21 +08:00
zhangqiang dd84a4bd3f 【鸿蒙阵】第一次激活鸿蒙碑的时候 两个329 替换位置 重置1级 错误bug 修复 2021-02-20 16:29:36 +08:00
DESKTOP-98AVA47\Administrator 80c175510e Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-20 15:46:53 +08:00
ZhangBiao b672c5e66b 【商店】调整元神商店顺序 2021-02-20 15:44:31 +08:00
guowei 1e2c5ea7c6 【主城添加鸿蒙碑升级的红点检测】 2021-02-20 15:44:09 +08:00
guowei 375f27f50e 【红点检测】 2021-02-20 14:52:04 +08:00
zhangqiang b6e56efd1c 【鸿蒙阵】 升星红点检测添加鸿蒙共鸣条件 2021-02-20 13:56:16 +08:00
zhangqiang 39686223d0 【鸿蒙阵】一键上阵 2021-02-20 11:37:56 +08:00
guowei 4a4f613ab2 【红点修改】 2021-02-20 11:00:40 +08:00
guowei 3c34072214 【鸿蒙阵修改】 2021-02-20 10:05:17 +08:00
jiaoyangna 3b7ff95aaf 属性图标修改提交 2021-02-19 18:18:09 +08:00
jiaoyangna 92e4a4a856 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-19 17:50:16 +08:00
jiaoyangna 05e1eceb99 属性图标修改 2021-02-19 17:50:10 +08:00
ZhangBiao 56f68bd9a2 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-19 16:39:54 +08:00
ZhangBiao 0584ed1e2f 【商店】元神商店页签提交 2021-02-19 16:39:27 +08:00
zhangqiang 4ce3da49d2 英雄属性图标提交 2021-02-19 16:29:02 +08:00
wangzhenxing ef40c02a3e 【战斗】=======战斗回合数显示修改 2021-02-19 17:04:56 +09:00
wangzhenxing ba4cc03dc1 [战斗]===========被动298修改,最大回合数显示修改 2021-02-19 16:47:06 +09:00
zhangqiang ca7a4aa10b 【装备数量显示】 装备数量 改为 装备种类 2021-02-19 15:13:38 +08:00
jiaoyangna 9ea4753856 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-19 13:44:35 +08:00
jiaoyangna 242af5be93 特效层级修改 2021-02-19 13:44:12 +08:00
zhangqiang ef48b0678a 【协议】 2021-02-19 11:54:15 +08:00
zhangqiang 1c95b576f0 Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-02-19 10:54:36 +08:00
zhangqiang 73f8e4d194 【元神商店】tab添加提交 2021-02-19 10:42:44 +08:00
zhangqiang 62230fe752 【魂印】合成去掉魂印文字 2021-02-18 15:29:40 +08:00
zhangqiang 459466ad49 【瑶池魔妖】 不显示圣物特殊处理 2021-02-18 15:02:12 +08:00
jiaoyangna 0b5b98a77a 【活动需求】勇往直前主题活动(社稷大典) 2021-02-18 10:52:02 +08:00
zhangqiang f34eb0c41a 逍遥特效提交 2021-02-05 16:46:08 +08:00
wangzhenxing 32b4e236a0 [战斗]=================去除没必要的特性被动修改 2021-02-05 17:00:34 +09:00
wangzhenxing 44a0b80b84 【战斗】================不触发特性相关修改 2021-02-04 14:24:56 +09:00
zhangqiang 8ea6f2fcf8 【合成优化】魂印合成优化2 2021-02-03 16:09:07 +08:00
jiaoyangna 505a5eaa66 主题活动提交
(cherry picked from commit 74fd7a8839)
2021-02-02 19:09:29 +08:00
jiaoyangna e0cd83e0f3 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
2021-02-02 18:49:05 +08:00
jiaoyangna ca1abfc0b5 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-02 18:26:54 +08:00