Commit Graph

4684 Commits (73588be932f244967051cb9441a2e2a98b8aa3c4)

Author SHA1 Message Date
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
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