Commit Graph

11060 Commits (54aeaa2ea834392647f359f114c39604230b6c64)

Author SHA1 Message Date
jiaoyangna 1e1e697ba4 预设漏提 2022-01-12 14:40:28 +08:00
jiaoyangna 6cc1b55503 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 14:36:43 +08:00
jiaoyangna 0b4cfe3a74 点击技能切换修改 2022-01-12 14:35:27 +08:00
ZhangBiao 6d29d5dce2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 14:28:26 +08:00
ZhangBiao 373ae35652 【家园】详情位置修改 2022-01-12 14:28:14 +08:00
jiaoyangna bde65d0ecf 森罗幻境累计奖励修改提交 2022-01-12 13:49:16 +08:00
jiaoyangna 82421e45bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 13:38:59 +08:00
jiaoyangna 93fda69ff5 升级突破状态显示错误修改 2022-01-12 13:37:39 +08:00
ZhangBiao d0fb035a19 【家园】提交弹框背景 2022-01-11 18:23:08 +08:00
ZhangBiao 60c31c1d5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 18:20:19 +08:00
ZhangBiao 617a557071 【家园】修改按钮 2022-01-11 18:20:12 +08:00
ZhangBiao 9826244e7e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 18:19:02 +08:00
ZhangBiao 8d82a962a6 【家园】特效提交 2022-01-11 18:18:41 +08:00
wangzhenxing 039f9a3deb [图鉴]======图鉴修改提交 2022-01-11 18:11:13 +08:00
ZhangBiao 9f8ee231ac 【装备界面】排行榜数据错误修改 2022-01-11 17:51:56 +08:00
zhangshanxue 18c1ef2de1 【物品】浮生门物品资源路径需修改 2022-01-14 17:23:40 +08:00
ZhangBiao 41dc638b32 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 16:44:52 +08:00
ZhangBiao e9d69353e0 【家园】建筑点击无效修改 2022-01-11 16:44:37 +08:00
lihaiyang 066d55fcc1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 16:38:11 +08:00
lihaiyang 2a47ffda3f 替换两个图标 2022-01-11 16:33:50 +08:00
jiaoyangna f943824ae9 共鸣中修改提交 2022-01-11 15:40:22 +08:00
jiaoyangna a01485ebab 资源提交 2022-01-11 15:36:17 +08:00
jiaoyangna 73f2fd21ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 15:31:48 +08:00
jiaoyangna e12e783590 共鸣中修改提交 2022-01-11 15:31:19 +08:00
lihaiyang 875da0fe84 被动技能临时图标 2022-01-11 15:05:13 +08:00
jiaoyangna 36c6228096 图片修改提交 2022-01-11 14:56:37 +08:00
jiaoyangna 4d58e36be4 神将界面技能报错修改 2022-01-11 14:44:16 +08:00
jiaoyangna e74d94e59e 神将情报界面修改提交 2022-01-11 14:40:18 +08:00
jiaoyangna 3cc4a7e6a3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 14:25:37 +08:00
gaoxin 0ee930c550 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 14:01:01 +08:00
gaoxin 5d2838554d Merge branch '0活动/新大圣升星' into china/dev 2022-01-14 14:00:20 +08:00
gaoxin e7a17fcd9e 【云梦豪礼】每日添加红点提示 2022-01-14 14:00:13 +08:00
gaoxin 2561da2203 【限时升星】选择舞小 2022-01-14 13:37:43 +08:00
gaoxin 81b3d254f4 【限时升星】锁定提示文字修改,选择神将保存到本地 2022-01-14 13:33:42 +08:00
gaoxin 9fbc2df41f 【限时升星】界面显示优化 2022-01-14 12:03:28 +08:00
gaoxin dbbfc9dfe3 【限时升星】选择神将界面标题错误 2022-01-14 11:50:16 +08:00
gaoxin 978d4acb4e 【限时升星】资源上传 2022-01-14 10:48:24 +08:00
jiaoyangna af9306d8cf 未解锁添加未解锁提示 2022-01-11 14:23:24 +08:00
wangzhenxing c219f28f6a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 13:57:09 +08:00
wangzhenxing 549343e721 [图鉴]=========添加公用获取英雄品质图片方法 2022-01-11 13:56:45 +08:00
jiaoyangna 8ae14c38fa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 13:49:38 +08:00
jiaoyangna b0e7ce6238 代码漏提 2022-01-11 13:49:18 +08:00
jiaoyangna 12cdbed48c 【ID1011029】
【优化】 神将界面优化
2022-01-11 13:48:54 +08:00
ZhangBiao e3c1c348e7 【家园】特权剩余时间修改 2022-01-11 13:29:58 +08:00
ZhangBiao d0bdfb935c 【家园】特权增加文字提示条目 2022-01-11 13:25:18 +08:00
jiaoyangna 041f21d530 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 12:02:20 +08:00
jiaoyangna 8e7a0eb4fa 适配修改提交 2022-01-11 12:02:02 +08:00
ZhangBiao 68a2995780 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 11:29:54 +08:00
gaoxin c984a101ac Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 09:47:24 +08:00
gaoxin 1d3f9ad425 【四灵编队】开始战斗报错 2022-01-14 09:47:18 +08:00
gaoxin d67f8cd2fa 【云梦豪礼】添加198裆位 2022-01-13 17:34:51 +08:00
ZhangBiao f94e79b6e2 【百宝商会】新增跳转 2022-01-11 11:29:43 +08:00
jiaoyangna 6bb00a785c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 11:28:58 +08:00
jiaoyangna ec6e504546 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:18:07 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
ZhangBiao c40be4411d 【家园】特权时间显示跳帧 2022-01-10 18:22:20 +08:00
ZhangBiao 893a8dd10b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 17:38:20 +08:00
ZhangBiao 567f5c1aa0 【家园】升级倒计时显示错误修改 2022-01-10 17:38:02 +08:00
ZhangBiao fa5d4001a2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 17:24:50 +08:00
ZhangBiao cc3791e0d5 【家园】修改到达上线提示文字、红点修改 2022-01-10 17:24:39 +08:00
jiaoyangna 2ef2c0d82e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 16:59:42 +08:00
jiaoyangna 62d30279c3 资源提交 2022-01-10 16:59:19 +08:00
gaoxin 28df447f1a 【限时升星】红点刷新不及时 2022-01-10 16:30:01 +08:00
ZhangBiao 5b796d8246 【命格】红点显示不正确 2022-01-10 15:48:38 +08:00
ZhangBiao 6b2860c5f4 【命格】获得命石后,有可穿戴入口没红点 2022-01-10 15:38:20 +08:00
ZhangBiao 2455410a0c 【命格】镶嵌按钮显示穿戴 2022-01-10 15:29:37 +08:00
ZhangBiao 0a947e37a2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 15:23:12 +08:00
ZhangBiao 7e96ae056f 【连购礼包】顺序错误修改 2022-01-10 15:23:02 +08:00
gaoxin 4f321a8b4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 15:06:33 +08:00
gaoxin 6ddd4c543f 【修为】修为点击问号,弹出鬼畜动画,当前是元婴期 2022-01-10 15:06:16 +08:00
ZhangBiao 3e11f70576 【云游商人】选择升级的装备,显示可以选择全部 2022-01-10 14:56:50 +08:00
gaoxin c795995bf6 【心魔试炼】奖励按钮显示错误 2022-01-10 14:33:20 +08:00
gaoxin f6463e72c8 【限时升星】添加锁定提示 2022-01-10 14:30:45 +08:00
jiaoyangna 018b4f9eeb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 13:36:11 +08:00
jiaoyangna 17615c95b8 法宝聚灵文字修改 2022-01-10 13:35:40 +08:00
gaoxin ee60ae6c9a 【限时升星】显示优化,红点添加,条件屏蔽添加 2022-01-10 11:44:39 +08:00
gaoxin dfb04baf75 【限时升星】添加可选择的升星有礼活动 2022-01-08 18:40:04 +08:00
ZhangBiao bb343cdcc5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 17:49:14 +08:00
ZhangBiao 244c8050e0 【装备】装备界面套装属性显示不正确修改 2022-01-08 17:49:04 +08:00
jiaoyangna 0281564bb3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 17:47:38 +08:00
gaoxin ecaa9f1dbc 【英雄选择】英雄选择界面通用化 2022-01-08 17:47:34 +08:00
jiaoyangna a0baa2e1c0 法宝聚灵增加星级加成 2022-01-08 17:47:18 +08:00
gaoxin 0a4c24520c 【编队筛选】红叉资源替换 2022-01-08 15:03:06 +08:00
gaoxin e12ddf56c6 【编队筛选】修复呼吸闪烁 2022-01-08 14:50:34 +08:00
gaoxin 2a630a8c25 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 14:23:59 +08:00
gaoxin a4bd6fb441 【日常】修复动画导致成就显示异常 2022-01-08 14:23:44 +08:00
ZhangBiao 129250110f 【建木神树】满级取消箭头 2022-01-08 14:22:30 +08:00
ZhangBiao 9098900dc7 【建木神树】提交 2022-01-08 11:54:31 +08:00
ZhangBiao c157985e24 【建木神树】调整 2022-01-08 11:36:31 +08:00
ZhangBiao e4a5f213e8 【建木神树】显示调整 2022-01-08 11:17:26 +08:00
ZhangBiao 94cf5e4aec 【建木神树】提交 2022-01-08 10:33:31 +08:00
ZhangBiao 314cc59bbc 【建木神树】提交 2022-01-07 19:39:58 +08:00
ZhangBiao 3d7b866229 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 19:34:22 +08:00
ZhangBiao 334ba9bd19 【建木神树优化】界面中可预览当前神应属性和下级增加属性 2022-01-07 19:34:07 +08:00
gaoxin 720d42f129 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 18:28:10 +08:00
gaoxin 2ad247d4f9 【神将筛选】职业图标更新 2022-01-07 18:27:57 +08:00
ZhangBiao 35aa32fe32 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 18:22:38 +08:00
ZhangBiao f3e9d3b2a5 【云游商人】顺序修改 2022-01-07 18:22:23 +08:00
gaoxin 963591b530 【动画】修复动画导致部分列表显示错误 2022-01-07 18:21:10 +08:00
jiaoyangna 9e8ff1942f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 16:46:46 +08:00
jiaoyangna f45ec94ea5 血条位置修改提交 2022-01-07 16:46:25 +08:00
gaoxin 34e90db4fd 【编队删选】添加职业筛选效果,高亮效果颜色修改 2022-01-07 16:40:31 +08:00
wangzhenxing ac0718f8b8 [战斗]======御甲叠加逻辑修改 2022-01-07 14:19:24 +08:00
jiaoyangna 62f7222e1b 法宝聚灵界面修改提交 2022-01-07 14:03:55 +08:00
jiaoyangna eea23a9dda 不显示收益修改提交 2022-01-07 13:58:20 +08:00
jiaoyangna 2c5f9c5473 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 13:43:37 +08:00
jiaoyangna fe4f9fdcf7 探索地图报错修改 2022-01-07 13:43:07 +08:00
ZhangBiao 61539a1e89 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 11:29:10 +08:00
ZhangBiao e16c47a8de 【家园】提交 2022-01-07 11:28:58 +08:00
jiaoyangna 31147f3c0a Revert "幸运探宝没开不需要隐藏修改"
This reverts commit 7c44812439.
2022-01-07 10:31:02 +08:00
jiaoyangna 7c44812439 幸运探宝没开不需要隐藏修改 2022-01-07 10:29:36 +08:00
jiaoyangna 082fb392d5 探索主城异常提交 2022-01-07 10:13:14 +08:00
ZhangBiao 6d5a716b10 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 18:42:30 +08:00
ZhangBiao 54b01f4d86 【家园+易经宝库】提交 2022-01-06 18:42:20 +08:00
jiaoyangna c794ab4048 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 18:35:21 +08:00
jiaoyangna 59bdf19b9e 主城预设提交 2022-01-06 18:34:48 +08:00
ZhangBiao a46e3263b7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 18:27:25 +08:00
ZhangBiao e0c228bf3f 【易经宝库】提交 2022-01-06 18:27:09 +08:00
jiaoyangna 79f89d355f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 18:26:08 +08:00
jiaoyangna b740f2abb7 探索引导提交 2022-01-06 18:25:28 +08:00
ZhangBiao 1373efaba8 【家园】摘星阁红点修改 2022-01-06 17:59:25 +08:00
ZhangBiao 956826c46a 【家园】摘星阁提交 2022-01-06 17:53:53 +08:00
ZhangBiao 456501e15a 【礼包】每日礼包 每周礼包 增加礼包名称展示 2022-01-06 17:10:50 +08:00
ZhangBiao 0bed9188dc 【家园】摘星阁提交 2022-01-06 17:04:13 +08:00
ZhangBiao 90ffb03c25 【家园】协议提交 2022-01-06 16:46:31 +08:00
ZhangBiao 11b9a285ba 【家园】upview提交 2022-01-06 16:41:17 +08:00
ZhangBiao 6b1c28a920 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2022-01-06 16:40:24 +08:00
ZhangBiao 1d26591062 【家园】资源提交 2022-01-06 16:27:09 +08:00
ZhangBiao 6f2b684ecd 【家园】提交 2022-01-06 16:25:20 +08:00
jiaoyangna e484b2bac8 星力聚灵资源提交 2022-01-06 16:15:49 +08:00
jiaoyangna 757c436878 编队预设提交 2022-01-06 16:12:10 +08:00
jiaoyangna b1be355601 Merge branch 'tansuo' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2022-01-06 16:07:59 +08:00
ZhangBiao cb9fc77b15 【家园】摘星阁文字提示提交 2022-01-06 15:52:51 +08:00
ZhangBiao 9c874f1789 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
2022-01-06 15:38:48 +08:00
jiaoyangna ac7a0a5ce6 资源提交 2022-01-06 15:38:24 +08:00
wangzhenxing f89526d96a [战斗]===========被动新增 414 -417 2022-01-06 15:30:40 +08:00
ZhangBiao 4133605f55 【家园】引导提交 2022-01-06 15:28:41 +08:00
jiaoyangna f3349ca4d1 【ID1010966】
【优化】法宝聚灵调整
2022-01-06 15:18:30 +08:00
jiaoyangna 9c1eb41856 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 14:52:22 +08:00
jiaoyangna 79364232f0 【ID1010966】
【优化】法宝聚灵调整
2022-01-06 14:52:02 +08:00
ZhangBiao 0c3c8e8c62 Merge branch '0功能/家园' of http://60.1.1.230/gaoxin/JL_Client into 0功能/家园 2022-01-06 14:23:51 +08:00
skuld 8f8e86d7c5 bat Resource Commit:2022/01/09, 4:55:32 2022-01-09 04:55:32 +08:00
ZhangBiao 7058575f3a 【家园】提交 2022-01-06 14:23:41 +08:00
gaoxin 7c0726e5b9 【神将详情】根据魂印的显示修改界面的大小 2022-01-06 12:03:35 +08:00
ZhangBiao 404618f9bc 【家园】摘星阁突破显示 2022-01-06 11:53:37 +08:00
ZhangBiao 68ad9cf7e1 【家园】提交 2022-01-06 11:45:28 +08:00
jiaoyangna c8b604bde4 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 11:30:35 +08:00
ZhangBiao 499e1d2d49 【家园】界面微调 2022-01-06 10:56:59 +08:00
ZhangBiao 893e33d920 【家园】提交 2022-01-06 10:33:08 +08:00
jiaoyangna 130e38f5b2 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 10:29:32 +08:00
jiaoyangna e9bfed6ab6 添加新的规则游戏报错修改 2022-01-06 10:20:27 +08:00
jiaoyangna 2b588340aa 【ID1019476】
【探索】称号遮挡复活中
2022-01-06 09:49:17 +08:00
ZhangBiao 2f03bf5ab7 【家园】提交 2022-01-05 19:12:54 +08:00
jiaoyangna 27a96fa139 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-05 18:18:06 +08:00
jiaoyangna 2a8b4bca8c 【ID1010994】
增加单笔充值活动
2022-01-05 18:17:36 +08:00
ZhangBiao 29a16ba5c8 【家园】提交 2022-01-05 18:16:10 +08:00
ZhangBiao aa761fc4e9 【家园】提交 2022-01-05 18:04:57 +08:00
gaoxin 662ad26223 【优化】心魔/四灵试炼增加编队按钮 2022-01-05 17:25:39 +08:00
ZhangBiao b45f74781c 【家园】提交 2022-01-05 17:06:34 +08:00
ZhangBiao 6f4942e87e 【家园】提交 2022-01-05 16:21:20 +08:00
jiaoyangna 8ab7558cac Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-05 15:38:23 +08:00
jiaoyangna 6ca1e17d52 【ID1010994】
增加单笔充值活动
2022-01-05 15:38:02 +08:00
ZhangBiao f0de43aad2 【家园】提交 2022-01-05 14:17:53 +08:00
ZhangBiao a4ab9eb231 【家园】报错提交 2022-01-05 11:05:11 +08:00
ZhangBiao 792a85407b 【坐骑】不显示修改 2022-01-05 11:00:59 +08:00
ZhangBiao ee7dc987a8 【家园】资源 2022-01-05 10:40:12 +08:00
ZhangBiao c0d27feac2 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2022-01-05 10:16:25 +08:00
ZhangBiao 19c27ae7bb 【家园】提交 2022-01-05 10:12:23 +08:00
ZhangBiao 5e0c53e322 【家园】替换底图 2022-01-04 18:58:34 +08:00
ZhangBiao 18ee882c96 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-04 16:58:07 +08:00
ZhangBiao 14044932b5 【命格】属性加成报错修改 2022-01-04 16:57:52 +08:00
jiaoyangna 7bfa7057ac 位置修改提交 2022-01-04 16:51:44 +08:00
jiaoyangna 7eade17002 提示位置修改提交 2022-01-04 16:47:24 +08:00
jiaoyangna 99014979b1 添加提示 2022-01-04 16:43:35 +08:00
jiaoyangna fb8de57afa 累计收益提交 2022-01-04 16:30:50 +08:00
jiaoyangna 1774e3d8bd 累计收益图片提交
(cherry picked from commit d33b2dad3b)
2022-01-04 16:29:02 +08:00
jiaoyangna d33b2dad3b 累计收益图片提交 2022-01-04 16:28:03 +08:00
jiaoyangna bc582b85e2 层级修改提交 2022-01-04 15:54:23 +08:00
gaoxin 5724728062 【职业筛选】颜色修改,添加混乱 2022-01-04 15:45:06 +08:00
jiaoyangna e079eff322 适配修改提交 2022-01-04 15:42:06 +08:00
ZhangBiao a07fdc40ac 【家园】提交 2022-01-04 15:10:35 +08:00
gaoxin 9de91f4259 【修行】删除黄点显示 2022-01-04 14:30:22 +08:00
jiaoyangna ebc67f1602 战力修改提交 2022-01-04 14:21:54 +08:00
gaoxin c07ba438a0 【职业筛选】颜色修改 2022-01-04 14:07:15 +08:00
gaoxin ad8653d679 Merge branch '0优化/山河社稷图筛选显示' into china/dev 2022-01-04 13:22:22 +08:00
ZhangBiao fbe50eb413 【家园】提交 2022-01-04 10:51:59 +08:00
gaoxin 108252b8e4 【排行】修复显示异常 2022-01-04 10:20:37 +08:00
gaoxin 9b2057bede 【山河筛选】添加职业呼吸效果 2022-01-03 02:17:03 +08:00
ZhangBiao 39244f8ce5 【家园】特权完成,2021最后的提交!! 2021-12-31 18:58:04 +08:00
ZhangBiao 2b3afae7ea 【家园】特权 2021-12-31 18:13:10 +08:00
jiaoyangna 5e28b8ad36 添加容错 2021-12-31 18:05:55 +08:00
gaoxin 0c9b3b4f96 【角色信息】修复回收立绘错误 2021-12-31 17:55:01 +08:00
gaoxin d1b84299c2 【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS 2022-01-03 02:43:00 +08:00
jiaoyangna fee12d7063 顶着复活中跑 2021-12-31 17:36:11 +08:00
jiaoyangna 330c34a0b8 探索地图人物切换修改 2021-12-31 16:32:08 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00
jiaoyangna 9880fcf8e8 地图中停止探索报错修改 2021-12-31 16:11:51 +08:00
jiaoyangna 17c6d0cdc7 地图小人挺住不动修改 2021-12-31 14:07:56 +08:00
jiaoyangna a35ad65ea3 添加容错 2021-12-31 13:49:48 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00