root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,588 Commits
38 Branches
2218 Tags
31 GiB
Commit Graph

7800 Commits (6bbf30e344a18d7478486d4999dab1989fa0a9a6)

Author SHA1 Message Date
ZhangBiao 11b5425f8b 【灵兽分解】分解完碎片后，显示错误 2021-08-18 17:53:52 +08:00
ZhangBiao 52bf5c79f2 【寻宝迷踪】增加音效 2021-08-18 15:31:52 +08:00
ZhangBiao 06b3814099 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-18 13:44:39 +08:00
ZhangBiao 30afec1613 【寻宝迷踪】预设冲突重新提交 2021-08-18 13:43:44 +08:00
jiaoyangna e2caaafbc5 删除log 2021-08-18 09:54:42 +08:00
ZhangBiao 2612c2e01e Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
 2021-08-17 19:53:05 +08:00
jiaoyangna c08ce1ea0b 【ID1018087】 
【适配】十绝阵1080*2550，显示不全
 2021-08-17 17:55:43 +08:00
jiaoyangna bc4af2601b 红点修改提交 2021-08-17 17:41:00 +08:00
jiaoyangna 662a760eaf 【ID1018142】 
【宝物】宝物分解界面，没有精炼加号，统一 一下
 2021-08-17 17:31:53 +08:00
jiaoyangna a23cd88b5b 【ID1018146】 
【玲珑宝镜】外圈奖励显示10000与奖励预览不一致
 2021-08-17 17:27:57 +08:00
jiaoyangna faf7591cf5 玲珑宝镜修改 2021-08-17 17:14:03 +08:00
ZhangBiao fab5388536 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
 2021-08-17 13:47:27 +08:00
ZhangBiao a3ba14fe2c 【寻宝迷踪】增加动态例会 2021-08-17 13:35:03 +08:00
gaoxin 0efe76995b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-16 16:50:52 +08:00
gaoxin 090bd32b66 【Version】只显示配置文件 2021-08-16 16:50:48 +08:00
ZhangBiao 9971d286ea 【寻宝迷踪】人物箭头提交 2021-08-16 15:37:01 +08:00
jiaoyangna 7a6935eb42 太初秘卷修改提交 2021-08-16 14:45:13 +08:00
jiaoyangna ab89dcfd17 去掉字符串前后空格 2021-08-16 14:22:58 +08:00
jiaoyangna a9d05bf258 修改报错日志 2021-08-16 14:05:29 +08:00
jiaoyangna 847dd9a83b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-16 13:57:23 +08:00
jiaoyangna 74f1bc4d4f 太初秘卷适配修改提交 2021-08-16 13:57:13 +08:00
ZhangBiao c5639ee2c7 【寻宝迷踪】提交 2021-08-16 11:55:50 +08:00
gaoxin 4d91c779c9 【神将升级】删除原用于防止升级超过突破等级的限制条件 2021-08-16 11:33:45 +08:00
jiaoyangna 51d1ea2524 太初秘卷图片修改 2021-08-16 11:25:45 +08:00
jiaoyangna 32aeee8180 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-16 10:46:45 +08:00
jiaoyangna fc09ac3c00 玲珑宝镜修改提交 2021-08-16 10:46:35 +08:00
ZhangBiao d94d02849d 【寻宝迷踪】寻宝按钮特效增加 2021-08-13 17:46:58 +08:00
zhangqiang 617d4d39c3 【十绝阵】排行榜修改 2021-08-13 16:35:33 +08:00
ZhangBiao 57cdcc0809 【寻宝迷踪】增加到达特效 2021-08-13 15:34:06 +08:00
ZhangBiao 17afa71bd2 【修行】预览调整 【魂灵宝】属性调整 2021-08-13 14:06:35 +08:00
zhangqiang f3e3cf9156 【修行预览 2021-08-13 13:37:24 +08:00
zhangqiang 33bbaf3cf9 【修行】预览增加星数，魂灵宝 2021-08-13 13:32:59 +08:00
zhangqiang edcd105a68 【灵兽信息】未获得的灵兽查看信息增加技能详细查看和等级信息 2021-08-13 10:31:53 +08:00
ZhangBiao 29c9ed6074 【魂灵宝】装备界面调整 2021-08-13 09:52:20 +08:00
ZhangBiao e678864743 【魂灵宝】装备界面增加等级上限 2021-08-12 20:01:56 +08:00
jiaoyangna 9c5850a2a5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 18:35:56 +08:00
jiaoyangna 39f355c0d1 适配修改提交 2021-08-12 18:35:23 +08:00
ZhangBiao e7ebe6527b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 17:38:39 +08:00
ZhangBiao e672b2644a 【魂灵宝】装备界面魂灵宝信息界面修改 2021-08-12 17:38:24 +08:00
jiaoyangna 5c4696ad6c 太初秘卷修改提交 2021-08-12 17:32:34 +08:00
ZhangBiao e3e0ef6ead 【寻宝迷踪】res提交 2021-08-12 14:56:58 +08:00
ZhangBiao a0ef88e58d Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
 2021-08-12 14:56:26 +08:00
jiaoyangna 027f2a3d86 十绝阵修改提交 2021-08-12 14:40:12 +08:00
jiaoyangna a5af78f2c9 主城界面修改 2021-08-12 12:00:36 +08:00
ZhangBiao bbe2bb6d6d 【寻宝迷踪】提交 2021-08-12 12:00:18 +08:00
jiaoyangna eaf6c12cf9 主城预设修改 2021-08-12 11:45:31 +08:00
jiaoyangna 4fe156364d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 11:41:37 +08:00
jiaoyangna 025583762d 十绝阵修改 2021-08-12 11:36:48 +08:00
jiaoyangna ce4a166777 Revert "跨服十绝阵修改提交" 
This reverts commit 657690cf3f.
 2021-08-12 11:22:05 +08:00
jiaoyangna 657690cf3f 跨服十绝阵修改提交 2021-08-12 11:18:43 +08:00
jiaoyangna 792b533fa0 太初秘卷修改提交 2021-08-12 11:02:21 +08:00
jiaoyangna f45b61adba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 10:55:15 +08:00
jiaoyangna 16fc435113 跨服十绝阵修改提交 2021-08-12 10:55:05 +08:00
zhangqiang c0c3013e2f 【大闹天宫】角色爬塔，界面不会跟随显示 2021-08-11 21:21:11 +08:00
ZhangBiao 13777a78cb 【寻宝迷踪】增加主角箭头 2021-08-11 19:33:01 +08:00
gaoxin 2d065b675c 【资源优化工具】ui贴图优化，修改为图片优化像素为2的N次方 2021-08-11 18:14:50 +08:00
ZhangBiao 4632665c49 【寻宝迷踪】拼图合成特效+小人落地特效 2021-08-11 17:53:59 +08:00
jiaoyangna b83ee5e000 太初秘卷修改 2021-08-11 17:14:20 +08:00
ZhangBiao 12f9a10ec8 【灵兽山升级】战力上升和属性提升对不上，斜着显示 2021-08-11 16:30:04 +08:00
ZhangBiao e19dda12e7 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-11 15:46:13 +08:00
jiaoyangna c3d45f1316 【ID1010059】 
【新功能】太初密卷
 2021-08-11 15:15:41 +08:00
gaoxin a6899e297e 【log】这个log会导致IOS切换账号卡死...什么鬼 2021-08-11 10:53:44 +08:00
ZhangBiao 939d577624 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-10 20:21:06 +08:00
ZhangBiao 88c2e3984e 【寻宝迷踪】增加进入地图黑边效果 2021-08-10 20:20:55 +08:00
ZhangBiao 6e9136aa14 【寻宝密宗】增加QA 2021-08-10 16:17:28 +08:00
ZhangBiao d017873b79 【寻宝迷踪】提交 2021-08-10 15:27:32 +08:00
zhangqiang 195006e5aa 【适配】1080*2550鸿蒙阵卸下神将遮罩没铺满 2021-08-10 15:24:01 +08:00
zhangqiang 36ec633294 【公会红包】有动画时点赞按钮显示位置不对 解决方法 缩放去掉动画 2021-08-10 15:18:13 +08:00
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
zhangqiang 5e891ff84b 【鸿蒙阵】步骤：共鸣效果100级，上阵共鸣神将，在化虚坛中进阶该神将，进阶后在鸿蒙阵把该神将卸下，并在神将情报界面升级，升级后重登，还原错误的天赋，但保留错误的等级 2021-08-10 14:56:34 +08:00
zhangqiang 0e0d5ffdb0 【鸿蒙阵】步骤：共鸣效果100级，上阵共鸣神将，在化虚坛中进阶该神将，进阶后在鸿蒙阵把该神将卸下，并在神将情报界面升级，升级后重登，还原错误的天赋，但保留错误的等级 2021-08-10 14:52:07 +08:00
ZhangBiao d7aa6d66f9 【无尽副本】特效穿透提交 2021-08-09 17:35:22 +08:00
ZhangBiao d10879ae57 【寻宝迷踪】res提交 2021-08-09 17:12:12 +08:00
ZhangBiao ed0f5296d1 【寻宝迷踪】提交 2021-08-09 17:11:30 +08:00
gaoxin 54c0a74afa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:52:33 +08:00
gaoxin b0d5798448 【登录】维护状态提示文字修改 2021-08-09 16:52:21 +08:00
jiaoyangna 615cc24f09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:50:04 +08:00
jiaoyangna 278530583d 牛气冲天跳转返回之后页签跳到第一个修改 2021-08-09 16:49:41 +08:00
gaoxin 8e43418825 【服务器】服务器选择界面每次打开时都重新获取一遍服务器列表数据 2021-08-09 16:32:14 +08:00
gaoxin c4c57893ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:31:24 +08:00
jiaoyangna dfb6132bc5 牛气冲天跳转神将抽卡 2021-08-09 16:21:46 +08:00
jiaoyangna cef09d39d8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:14:35 +08:00
jiaoyangna 206fd6793b 牛气冲天跳转点将台修改提交 2021-08-09 16:13:24 +08:00
gaoxin 639dbcac80 【服务器】选择服务器时维护状态提示文字修改 2021-08-09 16:13:20 +08:00
zhangqiang c957a96983 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-09 14:48:14 +08:00
ZhangBiao aae540d144 【寻宝迷踪】提交 2021-08-09 14:18:31 +08:00
gaoxin ac8927f4e6 【登录】修改服务器维护状态下，登录时的提示文字 2021-08-09 14:10:54 +08:00
ZhangBiao 0520c4c685 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-09 10:01:11 +08:00
jiaoyangna 97de80b9cd 图鉴提交 2021-08-06 17:19:44 +08:00
jiaoyangna 1adf97eddc 四元阵适配修改 2021-08-06 16:56:26 +08:00
jiaoyangna e26a8a698c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-06 15:47:37 +08:00
jiaoyangna 34357fddff 滑动条修改提交 2021-08-06 15:47:31 +08:00
zhangqiang 43609ae65d 山河设计图觉醒图标修正 2021-08-06 14:42:34 +08:00
ZhangBiao f40d297086 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-06 14:21:48 +08:00
ZhangBiao 87b7f4d7c8 【天宫秘宝】礼包购买逻辑修复 2021-08-06 14:21:27 +08:00
ZhangBiao ab0dece261 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-06 11:32:10 +08:00
ZhangBiao 4dc9136405 【寻宝迷踪】提交 2021-08-06 11:31:41 +08:00
jiaoyangna 5cf3388a59 滑动 回弹修改提交 2021-08-06 11:29:06 +08:00
ZhangBiao 4edc9a855b 【寻宝迷踪】提交 2021-08-05 17:23:25 +08:00
gaoxin 360cbbf54f 【公告】报错修改 2021-08-05 16:34:05 +08:00
liujiaqi 1952492eba 【资源】玉珏碎片icon 2021-08-05 15:40:36 +08:00
jiaoyangna 5336505935 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-05 15:10:04 +08:00
jiaoyangna ed3494e263 【ID1009947】 
【优化】四元阵界面 新增界面特效
 2021-08-05 15:09:58 +08:00
gaoxin 5f9bc0caae 【打包工具】修改出包的包名，以及日志提交的内容 2021-08-05 14:42:34 +08:00
gaoxin 597a747848 【公告】公告分包配置参数，PackID将代替SubNoticeID，对外将不再提供SubNoticeID的配置 2021-08-05 14:41:19 +08:00
gaoxin 59afbd6773 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-05 14:39:44 +08:00
gaoxin 0f5e66cfea 【公告】公告显隐改为config文件配置 2021-08-05 14:39:39 +08:00
ZhangBiao d86921d5a3 【降妖夺宝】次数修改提交 2021-08-05 14:33:07 +08:00
ZhangBiao 1c0880abbf 【寻宝迷踪】 2021-08-05 14:31:31 +08:00
gaoxin e4416573b8 【打包工具】添加更新蓝鲸sdk的功能 2021-08-05 10:59:48 +08:00
gaoxin 5dc039ab3a 【热更配置】跨服热更从test分支出 2021-08-04 22:14:59 +08:00
ZhangBiao 9bd336158d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 18:47:09 +08:00
ZhangBiao cad9409314 【万象商会】upview调整 2021-08-04 18:46:59 +08:00
ZhangBiao 87cf2102fe 【寻宝迷踪】添加资源 2021-08-04 18:16:36 +08:00
gaoxin e46fa3636d 【登录视频】修复登录视频黑屏 2021-08-04 18:06:51 +08:00
zhangqiang 1e4b55d9fd 【修改协议请求】修改进入游戏会向后的发送更换 称号 皮肤 坐骑 请求 2021-08-04 17:53:30 +08:00
zhangqiang 3cf8a5d2ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 17:43:11 +08:00
zhangqiang abb9873f80 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-04 17:42:47 +08:00
ZhangBiao c85cc55432 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-04 17:24:03 +08:00
ZhangBiao 50cbd0ea50 【灵兽山】增加灵兽界面跳转 2021-08-04 16:58:19 +08:00
ZhangBiao 78155b6a3f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 16:39:11 +08:00
ZhangBiao ddb9197a3e 【适配】灵兽信息界面 2021-08-04 16:38:54 +08:00
jiaoyangna 488b7469f6 【ID1009737】 
【滑动界面】可上下滑动的界面设定一个滑动上限
 2021-08-04 15:52:30 +08:00
gaoxin 8eb63b7692 【资源】我要变强背景资源回滚 2021-08-04 15:46:41 +08:00
jiaoyangna 70ad440eb3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 15:36:47 +08:00
jiaoyangna 3f9b6be120 【ID1009737】 
【滑动界面】可上下滑动的界面设定一个滑动上限
 2021-08-04 15:36:39 +08:00
ZhangBiao f254d3f34d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 14:55:33 +08:00
ZhangBiao 2ba5a58a3f 【紫府神印】增加预览功能 2021-08-04 14:55:24 +08:00
jiaoyangna 8cac60fad7 【ID1017911】 
英雄图鉴情报界面，点击法宝，遮罩上下没有铺满
 2021-08-04 13:51:24 +08:00
jiaoyangna 78a0c17a59 百宝商会特效修改提交 2021-08-04 11:47:37 +08:00
gaoxin d36ab6421a 【资源】挂机地图误删资源恢复 2021-08-04 09:51:44 +08:00
ZhangBiao c927af441a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 18:06:33 +08:00
ZhangBiao 3b86f741ee 【适配】增加限时兑换按钮特效 2021-08-03 18:06:02 +08:00
jiaoyangna 1f07968b5c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 16:50:07 +08:00
jiaoyangna 1827fa7217 图鉴界面神将皮肤错乱修改 2021-08-03 16:50:01 +08:00
gaoxin b82f910df8 【热更新】热更新界面退出游戏弹窗优化 2021-08-03 15:47:02 +08:00
ZhangBiao e0e015d06a 【适配】 2021-08-03 15:36:45 +08:00
ZhangBiao 3c83961895 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 15:29:37 +08:00
ZhangBiao 3199385550 【适配】 2021-08-03 15:29:26 +08:00
gaoxin f3ec579228 【妖晶礼包】删除前往邮箱领取提示 2021-08-03 15:26:47 +08:00
gaoxin 51e4e3206c 【成就提示】修复心魔快速战斗结算界面，通过成就跳转领取成就奖励后卡死的问题 2021-08-03 15:24:49 +08:00
ZhangBiao 0c6825597c 【升星有礼】适配 2021-08-03 15:21:12 +08:00
ZhangBiao fdaea1c133 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 13:58:19 +08:00
ZhangBiao 8f2c16d397 【适配】新将来袭、升星有礼 2021-08-03 13:58:09 +08:00
jiaoyangna 780db96526 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 13:33:01 +08:00
ZhangBiao 7eeb323b6e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 13:32:43 +08:00
ZhangBiao d07b4cfbc9 【适配】图鉴适配 2021-08-03 13:32:31 +08:00
jiaoyangna fabd517c04 【ID1017608】 
【点将台】点击箭头，当切换页面大于2个时，会出现明显未对准后校准状态
 2021-08-03 12:03:07 +08:00
zhangqiang 0de6e3f63a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 11:00:06 +08:00
zhangqiang 8ef10cb100 【主城小人层级】 2021-08-03 10:59:41 +08:00