Commit Graph

5086 Commits (4950e48b2f18014602f79e9b20bb8de20497bc95)

Author SHA1 Message Date
ZhangBiao 03a19bdd14 【森罗无尽】没有小人修复 2021-04-23 16:19:44 +08:00
ZhangBiao b3f3336fdc 【踏碎凌霄】提交 2021-04-23 16:18:56 +08:00
ZhangBiao c2e97f144d 【森罗无尽】小人消失i修改 2021-04-23 16:04:28 +08:00
ZhangBiao a9c21bc78a 【踏碎凌霄】 2021-04-23 15:39:46 +08:00
wangzhenxing 898edb53be [功能]==========聊天称号特效显示修改 2021-04-23 14:46:37 +08:00
ZhangBiao 5421e451c7 【云游商人】特效 2021-04-23 14:26:47 +08:00
ZhangBiao 08d8e0b8f3 【云游商人】特效问题修改 2021-04-23 14:16:40 +08:00
ZhangBiao bd236f0f32 【踏碎凌霄】 2021-04-23 14:12:24 +08:00
wangzhenxing 1b92e5fed4 删除重复得问号 加号图片 2021-04-23 11:20:17 +08:00
ZhangBiao 2df671ce67 【云游商人】装备穿戴卸下 道具消失报错 2021-04-23 10:19:38 +08:00
ZhangBiao 375e7a6205 【特效穿透】增加shader 2021-04-22 20:45:01 +08:00
jiaoyangna 42b91c0a4e 剧情提交 2021-04-22 18:13:28 +08:00
ZhangBiao 75be84bbff 【云游商人】怎加妖晶数量检测 2021-04-22 18:12:16 +08:00
ZhangBiao 99602b3008 【云游商人】问号,红点修改 2021-04-22 18:00:53 +08:00
jiaoyangna 20f6a06162 重复资源删除 2021-04-22 17:41:46 +08:00
ZhangBiao 9ba655847b Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄 2021-04-22 17:23:31 +08:00
ZhangBiao de6ac55599 【踏碎凌霄】 2021-04-22 17:22:49 +08:00
zhangqiang d373b1ff0f 【累积充值】金额斜了 2021-04-22 16:54:20 +08:00
ZhangBiao 045b0d80b3 【限时活动】奖励顺序调整 2021-04-22 15:53:47 +08:00
ZhangBiao b6350ad492 【踏碎凌霄】 2021-04-22 15:40:21 +08:00
zhangqiang 2b122d7fee 【公会援助】每次点击援助,列表都会重新置顶显示 2021-04-22 15:31:03 +08:00
jiaoyangna 5cd260fea5 资源提交 2021-04-22 15:26:00 +08:00
jiaoyangna a8393f2fb1 Merge branch 'china/dev-c' into 剧情
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-04-22 15:09:00 +08:00
jiaoyangna 0999af8061 资源提交 2021-04-22 15:07:18 +08:00
jiaoyangna a0ecd56968 剧情提交 2021-04-22 15:06:47 +08:00
jiaoyangna 3b59ae09ec Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-22 13:59:37 +08:00
jiaoyangna a5d90a6000 挂机界面报错修改 2021-04-22 13:59:33 +08:00
ZhangBiao eb9d3ed21c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-22 10:59:53 +08:00
ZhangBiao 8117c5ebba 【云游商人】怎加红点 2021-04-22 10:59:32 +08:00
zhangqiang f89fb7fc70 【限时召唤】限时召唤十连结果的顶部货币栏,不应显示普通召唤的货币,改为显示寻仙玉和妖晶——2 2021-04-22 10:32:45 +08:00
zhangqiang 720e9a2d75 【日常副本】“今日剩余次数”修改为“今日剩余免费次数”——3 2021-04-22 10:20:42 +08:00
zhangqiang 813fbee237 【邮件】已领取的附件图标上对应标志消失——2 2021-04-22 10:14:40 +08:00
zhangqiang 18984a9885 【邮件】已领取的附件图标上对应标志消失 2021-04-21 21:03:13 +08:00
ZhangBiao 35c89e734d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-21 20:24:23 +08:00
ZhangBiao 8e76fc3e5d 【云游商人】提交 2021-04-21 20:24:06 +08:00
zhangqiang 1a76599139 【神将情报】界面的神将属性放大镜点击无弹窗,没反应 2021-04-21 20:18:13 +08:00
zhangqiang e1cfc900b1 【送神祠跳转】仙缘余晨跳转送神祠,前往的是分解宝物页签 2021-04-21 20:09:58 +08:00
zhangqiang 6e5bec75bf 【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来——2 2021-04-21 19:53:13 +08:00
zhangqiang 9d773c0532 【日常副本优化】首次挑战副本不再消耗次数 —— 2 2021-04-21 18:14:28 +08:00
ZhangBiao 146929c099 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-21 18:06:43 +08:00
ZhangBiao 5eca5dd50e 【珍奇宝阁】双倍修改
(cherry picked from commit 0d4bacbe8297a34561275fe0c5720ff38e349769)
2021-04-21 18:06:35 +08:00
zhangqiang bf895d04d1 【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来 2021-04-21 17:49:58 +08:00
ZhangBiao f1538a4776 【限时活动】提交 2021-04-21 16:49:34 +08:00
ZhangBiao 6d08ce59a6 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼 2021-04-21 16:36:35 +08:00
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00
zhangqiang cf3758d19b 【三界降魔】活动结束后的提示文字优化 2021-04-21 15:47:21 +08:00
zhangqiang c53d8b43bf 【十绝阵优化】当前占据公会名称位置较低,向上移动些许位置 2021-04-21 15:46:51 +08:00
ZhangBiao eab420381c Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-21 15:02:04 +08:00
ZhangBiao aa834ad136 【限时活动】重构完成 2021-04-21 15:00:20 +08:00
wangzhenxing 8e24eea290 称号bug修改 2021-04-21 14:42:06 +08:00
zhangqiang 78220a5cf9 【珍奇宝阁】修改 2021-04-21 14:32:43 +08:00
jiaoyangna 993d891c2b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-21 14:31:32 +08:00
jiaoyangna 70b4ebdf83 容错修改 2021-04-21 14:31:26 +08:00
zhangqiang 048f1bafb9 【进度条优化】当进度条上限为1时,将进度条所在位置显示在最右侧 2021-04-21 14:30:15 +08:00
zhangqiang f4ca18ff74 【日常副本优化】首次挑战副本不再消耗次数 2021-04-21 11:45:55 +08:00
zhangqiang 6baba16701 【四元阵】将四元阵神将展示替换为原海外版 2021-04-21 11:45:08 +08:00
ZhangBiao 30361f5393 【限时活动】调整提交 2021-04-21 11:37:55 +08:00
jiaoyangna 13d88c62ac Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-21 10:58:05 +08:00
jiaoyangna 2d160ca755 资源提交 2021-04-21 10:57:21 +08:00
wangzhenxing eff7ceb60c 【ID1008821】
【主界面优化】当右侧未显示区域入口按钮有红点提示时,主界面闪烁显示向右的箭头
2021-04-21 10:50:18 +08:00
ZhangBiao 5043002676 【限时活动】限时兑换 2021-04-20 21:15:38 +08:00
zhangqiang 991fb61f57 【英雄升星祭品】提交——6 2021-04-20 20:59:43 +08:00
ZhangBiao a7bd34cdad 【限时活动】结构调整 2021-04-20 20:32:36 +08:00
zhangqiang a7dc372bb7 【英雄升星祭品】提交——5 2021-04-20 19:58:07 +08:00
jiaoyangna 61833b8b00 Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2021-04-20 17:51:14 +08:00
jiaoyangna 20cf3f88a9 挂机修改提交 2021-04-20 17:42:53 +08:00
ZhangBiao d1bbe68ebf 【限时活动】增加日限时累充 2021-04-20 17:41:48 +08:00
jiaoyangna 9b9d3cb1e9 礼包死循环修改提交 2021-04-20 17:39:02 +08:00
jiaoyangna c7f4c57585 点数修改 2021-04-20 17:21:32 +08:00
jiaoyangna 86bc16f904 名字添加 2021-04-20 17:14:25 +08:00
ZhangBiao 2051a59d74 【达人活动】结构调整 2021-04-20 16:43:16 +08:00
jiaoyangna 45b9c8d81b 名字提交 2021-04-20 16:42:59 +08:00
jiaoyangna 8590617839 名字提交 2021-04-20 16:31:41 +08:00
jiaoyangna 089f0ce436 挂机提交 2021-04-20 16:09:56 +08:00
zhangqiang ab3a0c3a75 【限时活动优化】界面布局与效果图不符 2021-04-20 15:11:23 +08:00
jiaoyangna 5b2ddbf8e6 点数调整 2021-04-20 15:10:41 +08:00
jiaoyangna 0fdb6b608d 名字提交 2021-04-20 15:07:10 +08:00
jiaoyangna 1e04dcc200 名字提交 2021-04-20 14:52:02 +08:00
jiaoyangna 9cf2502a10 删除log 2021-04-20 14:00:53 +08:00
zhangqiang aae0749f1a 【英雄升星祭品】提交 ——4 2021-04-20 13:48:55 +08:00
zhangqiang d7a74e8256 【归元优化】确认归元弹窗的神将头像改为固定显示在左侧第一位 2021-04-20 11:43:24 +08:00
zhangqiang 189e0f6062 【魂印优化】魂印界面的神将头像框颜色,改为当前神将实际星级对应的颜色 2021-04-20 11:24:19 +08:00
zhangqiang 7aefe7f4db 【日常副本】“今日剩余次数”修改为“今日剩余免费次数” 2021-04-20 11:19:17 +08:00
ZhangBiao b2df6d1282 【云游商人】 2021-04-20 11:17:50 +08:00
zhangqiang a4727e6de7 【升星优化】选择祭品神将页面,按照神将图鉴排序的反向规则进行排列,使珍贵的神将排序更为靠后,本体仍放在最后的位置 2021-04-20 11:13:03 +08:00
zhangqiang bee0fa412e 【神将合成】化虚坛和选择祭品界面添加长按头像功能 2 2021-04-20 10:38:28 +08:00
zhangqiang 3f903cf911 【神将合成】化虚坛和选择祭品界面添加长按头像功能 2021-04-20 10:17:57 +08:00
zhangqiang 1e688ab350 超值基金提交 2021-04-19 20:43:15 +08:00
zhangqiang d7913e5eab 超值基金,限时折扣,点击没反应修改 2021-04-19 20:42:11 +08:00
ZhangBiao 37003eea1b 【限时神装】更换背景图 2021-04-19 20:28:06 +08:00
ZhangBiao 24a8cbe9b0 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-19 20:12:51 +08:00
ZhangBiao b9acaaa12c 【云游商人】完成 2021-04-19 19:44:54 +08:00
zhangqiang 3fb2bae218 英雄左右快速切换 ui 重叠 2021-04-19 19:36:43 +08:00
jiaoyangna f3fa2c9a99 挂机界面提交 2021-04-19 18:20:57 +08:00
zhangqiang 4bb6004ace 【英雄升星祭品】提交——3 2021-04-19 18:05:15 +08:00
gaoxin fbe886fc85 Merge branch 'china/dev' into china/dev-c 2021-04-19 16:15:12 +08:00
zhangqiang 1942875c2e 【图鉴重叠】 2021-04-19 16:14:51 +08:00
gaoxin d6cad28914 Merge branch 'china/dev' into china/dev-c 2021-04-19 16:14:18 +08:00
wangzhenxing bf6d29d677 【ID1008678】
【战斗统计优化】战斗统计中关卡敌人显示具体的星级和品质边框
2021-04-19 16:08:15 +08:00
ZhangBiao bb5268793e 【云游商人】提交 2021-04-19 15:43:25 +08:00
zhangqiang 46efdd02de 【英雄升星祭品】提交——02 2021-04-19 15:11:39 +08:00
gaoxin a7575c7d37 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-19 13:59:14 +08:00
gaoxin 2c80bc9953 【资源】同名资源文件处理修改 2021-04-19 13:59:01 +08:00
zhangqiang 9706cd776d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-19 13:46:34 +08:00
zhangqiang de76c697c4 【英雄升星祭品】提交——01 2021-04-19 13:46:24 +08:00
jiaoyangna d101c5ce7b 名字修改提交 2021-04-19 13:02:37 +08:00
jiaoyangna efe1bdeab0 挂机界面修改 2021-04-19 11:58:22 +08:00
ZhangBiao 3005d9bf30 【云游商人】提交 2021-04-19 11:38:35 +08:00
jiaoyangna c94f1051da 挂机修改提交 2021-04-17 21:04:09 +08:00
zhangqiang 9b533fff0e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-17 17:50:24 +08:00
zhangqiang 1f6b8de581 【英雄详情】修改 2021-04-17 17:50:08 +08:00
jiaoyangna a277c5e6fa Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-17 17:20:58 +08:00
jiaoyangna fe837c22f4 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
2021-04-17 17:20:52 +08:00
ZhangBiao 9891a41f22 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-17 17:12:34 +08:00
ZhangBiao 034d0846c5 【森罗幻境】提交 2021-04-17 17:12:24 +08:00
zhangqiang 21e35dc81b 去掉动画 2021-04-17 16:55:37 +08:00
zhangqiang 777a3f7b30 动画修改 2021-04-17 16:49:24 +08:00
ZhangBiao 11ea817c16 【云游商人】 2021-04-17 16:45:33 +08:00
zhangqiang af8aed7701 图鉴错乱修改 2021-04-17 16:35:38 +08:00
JieLing eb5cfeb7f8 【每日礼包】一键购买修改 2021-04-17 16:16:10 +08:00
JieLing f30d2f042e 【提审切换】开关活动 2021-04-17 16:16:03 +08:00
ZhangBiao 48720f5dff 【新人商城】资源提交
(cherry picked from commit 8922b7eaba)
2021-04-17 14:03:35 +08:00
ZhangBiao e08a50f30c 【云游商人】 2021-04-17 14:01:12 +08:00
zhangqiang 1ee7063569 【限时招募】 提交 2021-04-16 18:13:09 +08:00
jiaoyangna 296d75d193 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-16 18:06:38 +08:00
jiaoyangna 909078e7ae 【每日礼包】 修改提交 2021-04-16 18:06:33 +08:00
ZhangBiao 07cda7e58e 【云游商人】提交 2021-04-16 17:25:11 +08:00
jiaoyangna 12f1a42161 挂机报错 提交 2021-04-16 16:22:15 +08:00
ZhangBiao 98237651c9 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼 2021-04-16 16:22:13 +08:00
ZhangBiao 78e320eb26 【云游商人】 2021-04-16 16:21:34 +08:00
wangzhenxing 4ea42d72a0 心魔试炼人物信息界面显示添加好友按钮 2021-04-16 16:12:43 +08:00
jiaoyangna 92104541fc Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-04-16 15:42:39 +08:00
ZhangBiao 762aef88e0 【云游商人】提交 2021-04-16 14:58:40 +08:00
jiaoyangna f91b6f8ca1 资源重复修改提交 2021-04-16 14:53:44 +08:00
gaoxin 60ccfce6dc 【累计充值】第二次销毁时报错 2021-04-16 14:23:31 +08:00
jiaoyangna fc6f3bd6d1 活动修改提交 2021-04-16 14:18:58 +08:00
wangzhenxing c544767e29 [功能]===========新手引导提交,心魔试炼排行榜添加玩家信息 2021-04-16 14:09:36 +08:00
jiaoyangna dafce7d9eb 礼包刷新界面死循环修改 2021-04-16 11:22:18 +08:00
ZhangBiao e142d0aad6 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-04-16 11:13:52 +08:00
ZhangBiao 6064633a28 【云游商人】资源提交 2021-04-16 11:12:17 +08:00
jiaoyangna 444e1e4428 限时招募提交 2021-04-16 10:08:33 +08:00
jiaoyangna 5f9144f4e5 挂机多人开启条件添加 2021-04-15 21:05:27 +08:00
jiaoyangna 5f29447434 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-15 20:37:00 +08:00
jiaoyangna c844a72609 【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空 2021-04-15 19:54:30 +08:00
gaoxin 8eb6c30d95 【战斗】战斗开始时清除轮转方法,(伏虎罗汉无限攻击的bug) 2021-04-15 19:05:01 +08:00
gaoxin 2974d71d13 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-15 19:04:05 +08:00
gaoxin fe74e55bc9 【十绝阵】文字显示修改 军团战 改为 十绝阵 2021-04-15 19:04:00 +08:00
ZhangBiao 72b4c2288f Merge branch 'china/dev' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
2021-04-15 17:21:28 +08:00
zhangqiang 3a4d593fdb 【礼包 公会援助】列表刷新置顶问题 2021-04-15 16:25:00 +08:00
jiaoyangna 3738137554 【挂机演示优化】挂机界面增加其他玩家 2021-04-15 15:51:24 +08:00
gaoxin 8f611f0340 【大闹天宫】敌人详情弹窗,有图片超框 2021-04-15 15:17:43 +08:00
gaoxin 196a319a4e 【跳过战斗】灵兽释放技能时,点击跳过战斗按钮无效 2021-04-15 15:11:25 +08:00
ZhangBiao 4b429e2a87 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-15 14:57:01 +08:00
ZhangBiao ac6697b461 【森罗】提交 2021-04-15 14:56:51 +08:00
zhangqiang b37f61f988 【宝物分解】 2021-04-15 14:35:19 +08:00
ZhangBiao d5879c2445 【森罗幻境】暂时还原 2021-04-15 14:24:40 +08:00
ZhangBiao 5d47d0b42e 【森罗】排序,选择相同将,修复 2021-04-15 12:26:47 +08:00
ZhangBiao 204e922062 【礼包判空】略过id=0的礼包 2021-04-15 10:28:09 +08:00
zhangqiang 68658a50c9 【宝物分解】 2021-04-15 09:56:33 +08:00
ZhangBiao fff121933f 【森罗幻境】选择相同神将报错修复 2021-04-15 09:35:24 +08:00
ZhangBiao 12a4d787c2 2021-04-14 20:11:53 +08:00
ZhangBiao 16625adb84 2021-04-14 20:06:07 +08:00
ZhangBiao 5ae5555011 【森罗幻境】选择英雄按战力发送英雄顺序 2021-04-14 20:00:06 +08:00
ZhangBiao de85b844e5 【逐圣商店】取消主胜商店红点 2021-04-14 17:41:44 +08:00
ZhangBiao c8cd41670b 【至尊豪礼】提交 2021-04-14 17:20:55 +08:00
ZhangBiao c686791e73 【至尊豪礼】资源提交 2021-04-14 14:48:30 +08:00
ZhangBiao 61670e86fc 【新人商城】完成 2021-04-14 14:01:14 +08:00
ZhangBiao 8922b7eaba 【新人商城】资源提交 2021-04-14 12:00:06 +08:00
ZhangBiao cce3a957f3 meta提交 2021-04-14 11:24:41 +08:00
zhangqiang 8cf7de1811 【大闹天宫】试炼节点显示有问题 2021-04-13 18:26:37 +08:00
zhangqiang 6d21fd41fb 【大闹天宫】试炼节点显示bug 2021-04-13 17:14:29 +08:00
ZhangBiao 2214d15550 【福星高照】拍脸增加主线引导冲突限制 2021-04-13 17:12:28 +08:00
ZhangBiao f1864ae6cf Revert "【每日累充】banner和按钮资源替换"
This reverts commit c34a3fcc24.
2021-04-13 16:54:48 +08:00
zhangqiang 0e8f87f32e 【魂印战力计算】bug 2021-04-13 16:34:30 +08:00
gaoxin e013f396b3 【引导战斗】所有剧情放到战斗里 2021-04-13 15:10:40 +08:00
ZhangBiao 3e6d68ee34 【福星高照】关闭upview 2021-04-13 14:39:35 +08:00
ZhangBiao 314301c3b0 【活动优化】每日礼包(一键购买)按钮 资源替换 2021-04-13 14:22:00 +08:00
ZhangBiao 6e87c6b41c 【十五日登录】奖励领完不关闭修复 2021-04-13 14:06:42 +08:00
ZhangBiao c34a3fcc24 【每日累充】banner和按钮资源替换 2021-04-13 13:46:09 +08:00
gaoxin f210a35821 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-13 00:38:39 +08:00
gaoxin a895a311d7 【超值基金】修改开启根据豪华月卡 2021-04-13 00:38:31 +08:00
ZhangBiao 41c34b4a9b 【十五日登录】连续点击报错提交 2021-04-12 23:33:16 +08:00
gaoxin dfe13f78be Merge branch 'china/local' into china/dev 2021-04-12 22:35:54 +08:00
gaoxin 0958baf1c0 【图鉴】皮肤显示打开 2021-04-12 22:30:46 +08:00
JieLing bfce2a542a 【资源】重名文件处理,meta文件提交 2021-04-12 22:06:58 +08:00
gaoxin bc323406e6 【buildconfig】国内删除本地化资源 2021-04-12 20:10:41 +08:00
ZhangBiao 4de980bf34 【十五日登陆】不改了 2021-04-12 20:02:56 +08:00
ZhangBiao 3d35e67c74 gameevent报错提交 2021-04-12 19:40:10 +08:00
ZhangBiao bcfb68a40a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 19:29:14 +08:00
ZhangBiao 090b0c8f70 【十五日登录】提交 2021-04-12 19:29:05 +08:00
gaoxin 2a94f1127f 【寻宝】文字显示还原 2021-04-12 19:17:28 +08:00
gaoxin 93da11a3b7 【引导】关闭假战斗引导,修改sdk获取玩家信息的接口 2021-04-12 18:56:07 +08:00
zhangqiang 412616ff78 【屏蔽称号页签】 2021-04-12 18:29:17 +08:00
ZhangBiao 73b3a2e268 【十五日登录】活动刷新延迟容错 2021-04-12 18:20:08 +08:00
gaoxin c338637ddc 【引导战斗】新的内容 2021-04-12 18:11:37 +08:00
gaoxin 867bcc62db Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 18:10:43 +08:00
gaoxin f56c620709 【假战斗】添加先后手配置 2021-04-12 18:10:39 +08:00
zhangqiang e6ca3f625d 【魂印】唯一限制的魂印会检测大闹天宫招募神将 2021-04-12 17:57:37 +08:00
ZhangBiao 4770fbae89 2021-04-12 17:14:57 +08:00
ZhangBiao e818791d38 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 17:07:59 +08:00
ZhangBiao 4ae91eda8e 【森罗幻境】修改数独小游戏的数字图片,将?居中 2021-04-12 17:07:27 +08:00
gaoxin 839a9e4d1d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 17:03:11 +08:00
ZhangBiao 0ded23ecde Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 16:34:47 +08:00
ZhangBiao 216cf7839c 【森罗环境】将按钮的start改为中文“开始” 2021-04-12 16:34:38 +08:00
wangzhenxing 443ba942cf [功能]================称号功能提交 2021-04-12 16:23:57 +08:00
gaoxin e02af6286e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 16:04:53 +08:00
gaoxin 56bf418509 Merge branch 'xma/dev' into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua
2021-04-12 16:04:46 +08:00
ZhangBiao 42cd84f7aa 【十五日登陆】刷新时间提交
(cherry picked from commit 135e13dcbb)
2021-04-12 15:32:56 +08:00
ZhangBiao b088d21df4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-04-12 15:31:00 +08:00
ZhangBiao 135e13dcbb 【十五日登陆】刷新时间提交 2021-04-12 15:30:11 +08:00
jiaoyangna b26f09d6a3 添加不显示前往按钮的跳转 2021-04-12 15:12:12 +08:00
JieLing 9e0710a861 Merge remote-tracking branch 'origin/master_xma_local' into xma/dev 2021-04-12 15:11:16 +08:00
ZhangBiao e986b8d956 【十五日】
(cherry picked from commit 0e41801daf)
2021-04-12 15:06:57 +08:00
ZhangBiao 276e0129fe 【十五日登陆】修改提交
(cherry picked from commit 8e0177d3ed)
2021-04-12 15:06:43 +08:00
ZhangBiao 0e41801daf 【十五日】 2021-04-12 15:04:33 +08:00
ZhangBiao 8e0177d3ed 【十五日登陆】修改提交 2021-04-12 15:02:49 +08:00
JieLing 9cd895e8e9 【资源处理】meta文件提交,文件压缩优化 2021-04-12 15:00:57 +08:00
jiaoyangna 034ed82f0f 皮肤错误修改 2021-04-12 14:02:03 +08:00
JieLing 52a2ecabd6 【活动开启】提审服关闭日周月礼包 2021-04-12 10:46:32 +08:00
JLIOSM1 e99b368abb 【adjust】修复打点错误 2021-04-11 04:21:55 +08:00
JieLing e8dd8f9bea 【活动】未开启的活动页签不再显示 2021-04-11 02:14:55 +08:00
wangzhenxing 450e2b412b [战斗]==================同步最新被动逻辑 2021-04-10 21:58:27 +08:00
JieLing 169253497d Merge branch 'xma/dev' into master_xma_local 2021-04-10 19:42:42 +08:00
gaoxin 798eedde7b 【adjust】包名修改 2021-04-10 19:22:13 +08:00
JLIOSM1 47a6118d81 【adjust】添加创建角色事件 2021-04-10 19:17:41 +08:00
gaoxin 52fb286afa 【本地化】修复第一次安装包时无法根据当前系统语言修改游戏内语言的问题 2021-04-10 19:08:57 +08:00
JieLing 8836fac87b Merge branch 'xma/dev' into master_xma_local 2021-04-10 18:51:39 +08:00
ZhangBiao 1981cc1836 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-10 17:58:04 +08:00
ZhangBiao cc34d28e8d 【公会红包】报错修改 2021-04-10 17:57:49 +08:00
JieLing ea7282bbbb Merge branch 'xma/dev' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-04-10 17:23:38 +08:00
zhangqiang f3a3c34e7c 【邮件】协议超问题 修改 2 2021-04-10 16:19:33 +08:00
zhangqiang 8ab2496c28 【邮件】增加协议 点击邮件再获取内容 2021-04-10 15:37:10 +08:00
ZhangBiao 692e1de637 偶现会显示妖晶或者经验有【200%】标识 修复 2021-04-10 14:15:10 +08:00
ZhangBiao 385e107b75 【boss来袭】越南语BOSS展示显示中文修复 2021-04-10 13:30:32 +08:00
gaoxin d620d4ff5e 【金钱显示】修复每日豪礼销毁再打开报错,更换MoneyNumView字体文件加载方式 2021-04-10 11:07:47 +08:00
zhangqiang 26e998ee59 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 21:54:01 +08:00
zhangqiang d73a1adcfb 【登录】修复海外登录服无法登录的问题 2021-04-09 21:53:47 +08:00
ZhangBiao 0b2c480b1d 【神将进阶】选择进阶神将名字无翻译 2021-04-09 21:21:48 +08:00
ZhangBiao 0f3c59a017 【图鉴皮肤】暂时关闭图鉴中皮肤 2021-04-09 21:12:56 +08:00
ZhangBiao 671ba829ca Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 20:31:55 +08:00
ZhangBiao da0d4f49d6 【装备详情】界面调整 2021-04-09 20:31:45 +08:00
zhangqiang ccbc758738 【未获得装备属性展示】 2021-04-09 20:22:25 +08:00
gaoxin 7aace673ab 【本地化】天书密卷修复在其他语言下文字重叠的问题 2021-04-09 20:14:15 +08:00
gaoxin e56ab6a0a2 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 20:04:22 +08:00
gaoxin cf78c74d3c 【本地化】修复试炼副本答题界面未翻译的问题 2021-04-09 20:04:17 +08:00
ZhangBiao 8cd52f0f83 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 19:40:06 +08:00
gaoxin 53cc2ff930 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 19:39:54 +08:00
ZhangBiao 8becd11f4d 【神衣天降】按钮价格修改 2021-04-09 19:39:50 +08:00
gaoxin ea06cd97e6 【本地化】部分界面文字错误修复 2021-04-09 19:39:48 +08:00
ZhangBiao 831d48f0ef Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 19:09:09 +08:00
ZhangBiao e83e9ae889 【魂印】购买确认界面的魂印图标错误,没有添加圆形遮罩 2021-04-09 19:08:59 +08:00
gaoxin e4144075ef 【乾坤宝盒】单抽光效在不同分辨率下显示错误 2021-04-09 18:28:32 +08:00
gaoxin 8e677abe4e 【本地化】GM界面不再翻译 2021-04-09 18:20:07 +08:00
gaoxin e55e8b51ee 【本地化】越南vip资源提交 2021-04-09 18:19:42 +08:00
gaoxin 0cc7de1597 【本地化工具】添加不导出文件配置,gm界面不再导出翻译 2021-04-09 18:02:32 +08:00
gaoxin 26fda17758 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 17:38:24 +08:00
gaoxin ea5648839c 【配置文件】添加对游戏语音,健康提示显示的配置 2021-04-09 17:38:18 +08:00
ZhangBiao e0449a4e47 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 17:13:15 +08:00
ZhangBiao a53f876a2f 【青龙秘宝】文字跳帧 2021-04-09 17:13:03 +08:00
jiaoyangna 82794896a0 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 16:56:11 +08:00
jiaoyangna 8d2bdf6228 限时神装 皮肤预览修改提交 2021-04-09 16:56:07 +08:00
ZhangBiao 3827aa3a15 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 16:53:04 +08:00
ZhangBiao 5814ca39db 【青龙秘宝】文字超框修改 2021-04-09 16:51:49 +08:00
gaoxin bfa2f1300f 【天宫寻宝】帮助按钮位置移动 2021-04-09 16:49:02 +08:00
gaoxin 495f588c2e 【logo】还原Logo 2021-04-09 16:35:36 +08:00
jiaoyangna c82b907b54 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 16:20:30 +08:00
jiaoyangna acca43f54c 菩提树神图片提交 2021-04-09 16:20:26 +08:00
gaoxin 196dfa34dd 【GM】添加红点数据查看工具 2021-04-09 16:14:24 +08:00
gaoxin 3418b63e02 【本地化】天宫寻宝文字关闭 2021-04-09 16:04:21 +08:00
ZhangBiao ce0a6a55d1 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 15:58:49 +08:00
ZhangBiao a2065c13f2 【社稷大典】领取贡献等级奖励,界面会重复播放打开时的动画 2021-04-09 15:58:20 +08:00
gaoxin 17c39e0d74 【本地化】翻译资源导入 2021-04-09 15:25:29 +08:00
jiaoyangna 66763117a3 立绘修改提交 2021-04-09 15:22:27 +08:00
ZhangBiao 1d447aee82 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 14:48:09 +08:00
ZhangBiao 5de102eb06 【天枢密卷】灯笼文字超框修改 2021-04-09 14:48:01 +08:00
gaoxin 4015e2a616 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 14:14:11 +08:00
gaoxin 75bd39a6c2 【icon】新增宝箱Icon 2021-04-09 14:13:56 +08:00
ZhangBiao cb89c89435 【限时神装】更改价格单位 2021-04-09 14:13:39 +08:00
jiaoyangna 3471fde5d2 重复资源提交 2021-04-09 13:55:55 +08:00
jiaoyangna 9496ef8943 meta 文件提交
(cherry picked from commit e0fec1aa3a)
2021-04-09 13:42:03 +08:00
jiaoyangna 071a91773a 导出 文本提交 2021-04-09 12:26:35 +08:00
jiaoyangna 8291a48e73 Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
jiaoyangna 38e64fb774 还原文字提交 2021-04-09 11:39:09 +08:00
jiaoyangna 6db7d3ac5c 车迟斗法开启提示修改 2021-04-09 11:11:25 +08:00
ZhangBiao ca5257e28d Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 11:07:14 +08:00
ZhangBiao 8893dd7d7b 【活动优化】日周月礼包增加角标及妖晶数量变更 2021-04-09 11:05:08 +08:00
zhangqiang 3bd507747e 【车迟斗法】车迟斗法倒计时不是在战斗结束开始计算 2021-04-09 10:57:31 +08:00
ZhangBiao 115b2ee04d Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-09 09:18:03 +08:00
wangzhenxing af967ecf93 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 21:10:41 +08:00
wangzhenxing d19f1cce1c [战斗]=====被动214,238修改 bug:1014491 1013881 2021-04-08 21:09:29 +08:00
zhangqiang a3647d7cbe 【排行榜】与排行第一切磋后返回,不显示小人形象 2021-04-08 21:07:36 +08:00
zhangqiang 19ba1ffc5a 【分解】神将达到上限,分解后,再获得神将依然提示已达上限,重登正常 2021-04-08 21:03:47 +08:00
jiaoyangna fa4cdf0f2d 主城添加判断等级判断 2021-04-08 20:55:49 +08:00
jiaoyangna e14b9d4343 主城修改 提交 2021-04-08 20:52:59 +08:00
gaoxin 075101090d 【首充】文字显示调整 2021-04-08 20:52:01 +08:00
ZhangBiao 3edd56034a Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 20:48:31 +08:00
ZhangBiao b3aa8ebf2a 【神将置换】英雄名过长修改 2021-04-08 20:48:17 +08:00
gaoxin ba17f4fdc2 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 20:40:05 +08:00
gaoxin eab8a42191 【灵兽特惠】金钱显示兼容 2021-04-08 20:40:00 +08:00