Commit Graph

3521 Commits (bbbf5598d62e5dfb92555a1460a3b35ed17cf89f)

Author SHA1 Message Date
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
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
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
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
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
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
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 6e87c6b41c 【十五日登录】奖励领完不关闭修复 2021-04-13 14:06:42 +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 0958baf1c0 【图鉴】皮肤显示打开 2021-04-12 22:30:46 +08:00
ZhangBiao 4de980bf34 【十五日登陆】不改了 2021-04-12 20:02:56 +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 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 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
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 135e13dcbb 【十五日登陆】刷新时间提交 2021-04-12 15:30:11 +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
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 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
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 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 a53f876a2f 【青龙秘宝】文字跳帧 2021-04-09 17:13:03 +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
ZhangBiao a2065c13f2 【社稷大典】领取贡献等级奖励,界面会重复播放打开时的动画 2021-04-09 15:58:20 +08:00
jiaoyangna 66763117a3 立绘修改提交 2021-04-09 15:22:27 +08:00
ZhangBiao 5de102eb06 【天枢密卷】灯笼文字超框修改 2021-04-09 14:48:01 +08:00
ZhangBiao cb89c89435 【限时神装】更改价格单位 2021-04-09 14:13:39 +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
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
zhangqiang 393a05ee99 【大闹天宫】生死簿神将头像边框颜色与品质不符 2021-04-08 20:27:21 +08:00
gaoxin 4a1a95d9fd 【八日登录】修复第四天后的提示白片 2021-04-08 20:23:06 +08:00
gaoxin f49bb49041 【每日豪礼】金钱显示走活动表 2021-04-08 20:20:09 +08:00
gaoxin effab48074 【每日豪礼】金钱数量走表 2021-04-08 20:10:25 +08:00
gaoxin 4a3d61b159 【每日豪礼】金钱显示兼容处理 2021-04-08 20:07:19 +08:00
zhangqiang d1f88d5b33 【红点】退出公会,入口依然显示红点 2021-04-08 20:03:19 +08:00
ZhangBiao 56c0462062 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 19:58:51 +08:00
ZhangBiao 78c1b12067 【森罗幻境】小游戏转盘,灵兽碎片显示整只灵兽 2021-04-08 19:58:41 +08:00
zhangqiang cc6137697a 加打印 2021-04-08 19:45:04 +08:00
gaoxin 10f502dc14 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 18:16:47 +08:00
gaoxin 500d54469d 【扫光】挂机,充值界面扫光光效添加 2021-04-08 18:16:28 +08:00
zhangqiang 2be3a11fe7 【尝试修复邮件红点】 2021-04-08 18:15:29 +08:00
ZhangBiao 4977de55ba 【坐骑】界面文字适应修改 2021-04-08 18:01:29 +08:00
jiaoyangna dde0be7d87 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-08 17:58:20 +08:00
jiaoyangna c86307d328 图鉴添加皮肤页签 2021-04-08 17:58:17 +08:00
ZhangBiao f49455e1a8 【自选宝箱】文字提示暂无外语版本,改回
(cherry picked from commit 0d3f84f5e1)
2021-04-08 17:50:12 +08:00