Commit Graph

3654 Commits (5da3914599469101413106cdabc70c1d5d4e0286)

Author SHA1 Message Date
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
ZhangBiao 2da1f06bcb 【自选宝箱】还是修改
(cherry picked from commit 89c8179840)
2021-04-08 17:49:58 +08:00
ZhangBiao fdbf4d054b 【自选宝箱】
(cherry picked from commit 16db37cf29)
2021-04-08 17:49:52 +08:00
ZhangBiao a49fbd2183 【自选宝箱】文字提示
(cherry picked from commit cb5c940e25)
2021-04-08 17:49:44 +08:00
ZhangBiao f87aafafbc 【自选箱】遮盖文字修改
(cherry picked from commit adc2d56559)
2021-04-08 17:49:34 +08:00
gaoxin 3ccf1e6c44 【语音】添加是否播放游戏语音的控制字段 2021-04-08 17:32:40 +08:00
gaoxin 795657a213 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 17:31:38 +08:00
gaoxin 680d3e2e7d 【金钱显示】修复累计充值第一个商品显示错误 2021-04-08 17:31:32 +08:00
jiaoyangna dd98250771 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-08 17:30:08 +08:00
jiaoyangna d86700277c 【ID1008675】
【图鉴优化】增加神将皮肤预览
2021-04-08 17:30:04 +08:00
ZhangBiao fe2e122607 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 17:24:52 +08:00
ZhangBiao 0d3f84f5e1 【自选宝箱】文字提示暂无外语版本,改回 2021-04-08 17:24:39 +08:00
jiaoyangna 5740120f53 【ID1008675】
【图鉴优化】增加神将皮肤预览
2021-04-08 17:24:36 +08:00
jiaoyangna 32f5e051ad Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 17:03:34 +08:00
jiaoyangna 7784e3a9d1 主题活动提交
(cherry picked from commit d9c500fb36)
2021-04-08 17:03:29 +08:00
zhangqiang fa8e10ed9c 【大闹天宫】赛季重置是圣物新字显示bug 2021-04-08 16:58:39 +08:00
ZhangBiao 3833c53f68 【十五日登录、福星高照】修改 2021-04-08 16:39:02 +08:00
ZhangBiao 89c8179840 【自选宝箱】还是修改 2021-04-08 15:36:27 +08:00
ZhangBiao a7328fdfaf Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 15:02:10 +08:00
ZhangBiao 16db37cf29 【自选宝箱】 2021-04-08 15:02:01 +08:00
zhangqiang da4270b99b 【公会公告】 2021-04-08 14:59:19 +08:00
ZhangBiao cb5c940e25 【自选宝箱】文字提示 2021-04-08 14:53:36 +08:00
ZhangBiao 68539ff1ff Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-08 14:44:17 +08:00
ZhangBiao adc2d56559 【自选箱】遮盖文字修改 2021-04-08 14:44:08 +08:00
gaoxin 45bb99f9c7 【公会】公会红包公告不会随语言切换 2021-04-08 12:00:50 +08:00
zhangqiang 8e7537a761 【首冲】钱显示修改 2021-04-08 11:47:22 +08:00
ZhangBiao bc15cb20f6 【十五日登陆】微调 2021-04-08 11:26:05 +08:00
zhangqiang 972e585d8a 【300】 2021-04-08 11:08:54 +08:00
jiaoyangna ce8ffa9607 充值界面充值跳转月卡页签之后切换其他页签 界面显示错误 修改 2021-04-08 10:50:19 +08:00
zhangqiang 4b1f021ac0 【累计充值】 2021-04-08 10:18:24 +08:00
zhangqiang e84bdaf457 【每日好礼】 2021-04-07 21:07:42 +08:00
jiaoyangna 4926d16dc2 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 20:28:16 +08:00
jiaoyangna efd1c6fab9 逍遥预设提交 2021-04-07 20:28:12 +08:00
ZhangBiao d423390397 【十五日登录】特效+无尽副本编队问题 2021-04-07 20:27:56 +08:00
wangzhenxing dada859ec6 [战斗]========battleutil 添加判断数组长度方法 2021-04-07 20:14:43 +08:00
zhangqiang 894a8bcfd4 【问题提交】 2021-04-07 19:52:25 +08:00
ZhangBiao 31d0a4ea93 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 17:48:15 +08:00
ZhangBiao 83f173bc74 【天枢密卷】提交 2021-04-07 17:48:07 +08:00
jiaoyangna f49bb447fc Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 17:47:00 +08:00
jiaoyangna 8696940dda 逍遥提交 2021-04-07 17:46:56 +08:00
ZhangBiao 027de719b6 【福星高照、限时神装】 2021-04-07 17:20:23 +08:00
ZhangBiao 21b97b3985 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 16:59:56 +08:00
ZhangBiao 6117dd2363 【牛气冲天】翻译修改 2021-04-07 16:59:47 +08:00
zhangqiang 69d3f4a331 【bug 主要是翻译】 2021-04-07 16:38:26 +08:00
jiaoyangna 6794c272c0 逍遥游提交 2021-04-07 16:30:20 +08:00
jiaoyangna 40351af4da Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-07 16:12:32 +08:00
jiaoyangna 17bc3ce580 逍遥boss 提交 2021-04-07 16:12:29 +08:00
ZhangBiao 33c598e2d9 【天数密卷】按钮文字旋转 2021-04-07 15:22:32 +08:00
ZhangBiao bfaa5195b5 Revert "【表删除】报错处理"
This reverts commit b163fc3035.
2021-04-07 11:54:39 +08:00
zhangqiang b05c9a8c1c 【bug】 十绝阵翻译修改引用 2021-04-07 11:43:25 +08:00
ZhangBiao c9f0efe3f6 【无尽森罗】无法进入修改 2021-04-07 11:35:48 +08:00
jiaoyangna 586d7eca06 限时召唤提交 2021-04-07 11:24:49 +08:00
ZhangBiao 704dd1ffa5 【化虚坛】未翻译 2021-04-07 11:20:58 +08:00
ZhangBiao 58d20c0bd3 【限时活动】没东西有红点 2021-04-07 11:05:26 +08:00
zhangqiang 132e4c1260 【bug】奖励排行拉不到底部 2021-04-07 10:30:47 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin d6319948f2 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
jiaoyangna f6f48149b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 17:42:05 +08:00
jiaoyangna 04721fe715 【ID1008672】
【逍遥游优化】解锁上方的地图后,进入选择界面默认滚动至相应的入口位置
2021-04-06 17:42:02 +08:00
ZhangBiao 0387c7cf33 【森罗幻境】根据英雄战力排序 2021-04-06 17:26:59 +08:00
jiaoyangna eac03c7d20 车迟斗法提交 2021-04-06 17:02:25 +08:00
jiaoyangna 0df3ee5ea8 车迟斗法描述修改 2021-04-06 16:50:51 +08:00
jiaoyangna 53d8603044 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 16:44:07 +08:00
jiaoyangna db80db31c2 升星神将显示名字修改 2021-04-06 16:44:04 +08:00
ZhangBiao 7a59fe9d6a 【十五日登陆】增加红点
(cherry picked from commit 120106c6d0d8957d7e7f0bbce687fafd42a70277)
2021-04-06 16:20:36 +08:00
jiaoyangna 0d581ebb97 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 16:14:34 +08:00
ZhangBiao 63bcee6168 Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-04-06 15:51:24 +08:00
gaoxin d90b9145b8 Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-06 15:24:46 +08:00
gaoxin cf5a2a46fa 【本地化】还原文本到代码种 2021-04-06 15:23:27 +08:00
gaoxin fc28c2c0a3 Merge branch 'china/dev' into gx/china/dev_tr 2021-04-06 15:21:49 +08:00
gaoxin 08c5c7b423 【本地化】导出文本 2021-04-06 15:21:38 +08:00
jiaoyangna bf4a9ffaa5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 15:20:17 +08:00
jiaoyangna 6e68ac5949 【ID1008671】
【升星优化】升星选择祭品神将时,增加显示内容
2021-04-06 15:20:00 +08:00
gaoxin b163fc3035 【表删除】报错处理 2021-04-06 15:16:37 +08:00
zhangqiang 0b85a85e18 【大闹天宫】 间隔阶段重登提示有问题 2021-04-06 15:11:29 +08:00
jiaoyangna 75feb507d1 【ID1008659】
【图鉴优化】图鉴添加排序规则,按照神将由强至弱进行排序
2021-04-06 14:51:26 +08:00
ZhangBiao 119c499da3 【好友】删除后停留在原位 2021-04-06 14:26:47 +08:00
jiaoyangna fd08211e30 主题活动图标修改 2021-04-06 13:52:27 +08:00
jiaoyangna b260d2d583 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 11:52:48 +08:00
jiaoyangna f1a8a740c7 【ID1008091】
【活动优化】超值基金购买后,主城超值基金入口倒计时消失
2021-04-06 11:52:44 +08:00
zhangqiang a9d77de2b2 【十绝阵】未产生宝箱时显示的领取截止时间错误 2021-04-06 11:38:25 +08:00
ZhangBiao 5ab1295c10 【好友】赠送好友友情点,每点一下都会播放动画 2021-04-06 11:17:22 +08:00
zhangqiang 86a99f3344 【无尽副本】一键上阵修改 2021-04-02 21:11:37 +08:00
ZhangBiao 53f095011e 【牛气冲天】特效层级修改
(cherry picked from commit 53308beca2)
(cherry picked from commit 672b5acd10caeca26906c4c9ddfb840fd3b121df)
2021-04-02 19:29:39 +08:00
ZhangBiao 53308beca2 【牛气冲天】特效层级修改 2021-04-02 19:27:35 +08:00
ZhangBiao d99899d37f 【十五日登陆】 2021-04-02 19:06:08 +08:00
ZhangBiao 4c0150b7d9 【十五日登陆】导入特效资源 2021-04-02 16:04:57 +08:00
zhangqiang 855c7159b8 【巅峰赛】尝试修改去掉注释 2021-04-02 16:01:26 +08:00
zhangqiang c45d20f9da 【巅峰赛】尝试修改 2021-04-02 15:47:07 +08:00
zhangqiang 7bea1cf11a 【巅峰赛】尝试修改 2021-04-02 15:42:36 +08:00
wangzhenxing ef374b841a [战斗]======破盾,清除提示文字修改 2021-04-02 15:02:14 +08:00
gaoxin b8c845b6f5 【表删除】BeginnerTask 2021-04-02 14:50:34 +08:00
gaoxin 1de64d1492 【表删除】AdventureReward 2021-04-02 14:49:00 +08:00
gaoxin 28ca69e078 【表删除】AdventureConfig 2021-04-02 14:48:12 +08:00
gaoxin 472829239e 【表删除】AccomplishmentConfig 2021-04-02 14:46:31 +08:00
gaoxin 1dc2b05f04 【表删除】EquipTalismanaRankup 2021-04-02 14:40:02 +08:00
ZhangBiao d69d96a321 【十五日登陆】红点 2021-04-02 11:53:07 +08:00
jiaoyangna 57604c4c76 成长礼包提交 2021-04-02 11:41:50 +08:00
gaoxin 1a4c96e88d Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv
2021-04-02 11:34:27 +08:00
jiaoyangna c9a3a40acf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 11:25:04 +08:00
jiaoyangna 640c866388 成长礼包 红点修改 2021-04-02 11:24:59 +08:00
ZhangBiao 8cf3c62bbf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 10:53:49 +08:00
ZhangBiao 2688f37d72 【牛气冲天】增加特效
(cherry picked from commit f8b01c8e8d)
2021-04-02 10:53:29 +08:00
ZhangBiao f8b01c8e8d 【牛气冲天】增加特效 2021-04-02 10:52:53 +08:00
jiaoyangna 223afd4c57 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 10:45:54 +08:00
jiaoyangna 6de42f5b43 限时兑换红点提交 2021-04-02 10:45:11 +08:00
zhangqiang fc95cfb52c 【巅峰赛 bug】 三局两胜 第三场不刷新bug 3 2021-04-02 09:55:55 +08:00
zhangqiang 881cc1717b 【巅峰赛 bug】 三局两胜 第三场不刷新bug +2 2021-04-02 09:55:32 +08:00
zhangqiang 3d8fd5a748 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 20:26:56 +08:00
zhangqiang e4da98bff6 【bug修改】 2021-04-01 20:26:43 +08:00
ZhangBiao 4927a85f01 【自选宝箱】无特效修改 2021-04-01 20:22:15 +08:00
jiaoyangna 28c8ee841d 每日礼包加锁修改 提交 2021-04-01 19:05:43 +08:00
jiaoyangna c18b59502a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 19:04:13 +08:00
jiaoyangna 053f890498 成长礼包修改提交 2021-04-01 19:04:01 +08:00
zhangqiang abe9d67927 十绝阵奖励】领奖阶段,未被领取的箱子可以查看到奖励 2021-04-01 19:02:47 +08:00
jiaoyangna 8884dd4920 文本导出 2021-04-01 18:54:28 +08:00
jiaoyangna a81c48c533 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
2021-04-01 18:52:58 +08:00
jiaoyangna cff04dc520 签到 修改 2021-04-01 18:50:06 +08:00
gaoxin 68493d2b60 【本地化】还原文本 2021-04-01 18:45:39 +08:00
ZhangBiao 54870cd601 【牛气冲天】动画修改
(cherry picked from commit 6e62ebd50a)
2021-04-01 18:42:52 +08:00
ZhangBiao 6e62ebd50a 【牛气冲天】动画修改 2021-04-01 18:41:58 +08:00
gaoxin b53717c9ee 【本地化】还原文本 2021-04-01 18:41:50 +08:00
gaoxin cbb28ebeae 【本地化】文本导出 2021-04-01 18:36:34 +08:00
ZhangBiao f7f839ddf4 【十五日登陆】差红点,主城按钮、特效 2021-04-01 18:24:45 +08:00
ZhangBiao 74077e2484 【十五日登陆】 2021-04-01 17:44:44 +08:00
wangzhenxing acfe38c973 [战斗]==========被动263 被动168修改 2021-04-01 17:11:54 +08:00
zhangqiang 2497735700 【关卡】在25级关卡和27级关卡,卡等级的时候,“挑战关卡”按钮是置灰的 2021-04-01 16:21:35 +08:00
jiaoyangna 0e752b76a6 每日礼包 换天自动刷新修改 2021-04-01 16:12:20 +08:00
ZhangBiao e86078ce69 【十五日登陆】 2021-04-01 16:04:13 +08:00
jiaoyangna b21ed5a44e 礼包修改提交 2021-04-01 15:42:59 +08:00
jiaoyangna b663c351b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 14:56:50 +08:00
jiaoyangna ae17483a8e 灵兽 修改提交 2021-04-01 14:56:47 +08:00
zhangqiang 1d4c446c33 【大闹天宫】复活节点无法复活助战神将 2021-04-01 14:46:07 +08:00
zhangqiang aa17c175b7 【无尽副本】阵亡神将可以一键上阵 2021-04-01 14:05:21 +08:00
jiaoyangna a6428eaaed 红点 修改提交 2021-04-01 13:44:05 +08:00
jiaoyangna 9bfd85bb0a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 12:30:59 +08:00
jiaoyangna c70343585a 主题活动 修改 2021-04-01 12:30:37 +08:00
zhangqiang a20dc99f99 【大闹天宫】挑战失败后显示两个可挑战图标,点击另一个未挑战过的怪没反应,退出重进显示正常 2021-04-01 10:39:03 +08:00
zhangqiang 264a682b4b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 22:40:35 +08:00
zhangqiang 872b779aff 【日常任务】日常任务活跃奖励 点的过快第二个宝箱就会没反应 2021-03-31 22:40:07 +08:00
gaoxin 01aacccfaf 【红点】修复方法名错误 2021-03-31 22:31:36 +08:00
zhangqiang 987179041c 【创建名字】boy 2021-03-31 22:25:54 +08:00
jiaoyangna 784ace13b5 红点提交 2021-03-31 22:22:53 +08:00
zhangqiang e05a69f3a4 【福利保箱】 2021-03-31 21:51:14 +08:00
jiaoyangna 618e3a5014 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 21:46:18 +08:00
jiaoyangna 7d055c4e3a 红点提交 2021-03-31 21:46:14 +08:00
zhangqiang 957aff00a5 【放生灵兽白片】 2021-03-31 21:19:56 +08:00
jiaoyangna 56605c0ab7 购买特权 刷新礼包 修改 2021-03-31 19:56:31 +08:00
jiaoyangna 02fde882a8 妖晶不足跳转修改 2021-03-31 19:33:12 +08:00
jiaoyangna 85c09e3094 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 19:30:56 +08:00
jiaoyangna 104f52f61b 特权礼包滑动位置 修改 2021-03-31 19:30:45 +08:00
zhangqiang 4698fc6dbf 【福利签到】bug 2021-03-31 19:26:44 +08:00
jiaoyangna 61426fba07 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 19:08:04 +08:00
jiaoyangna e73cf4533b 报错修改 2021-03-31 19:07:50 +08:00
gaoxin 5f16021a0e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 19:06:34 +08:00
gaoxin 9c080a0cac 【激素探索】按钮扫光光效修改 2021-03-31 19:06:16 +08:00
jiaoyangna 292515e12e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:41:47 +08:00
ZhangBiao 2204717b5a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:40:34 +08:00
jiaoyangna 4365e8afff Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:39:02 +08:00
jiaoyangna f8245898b0 特权礼包修改提交 2021-03-31 18:38:57 +08:00
zhangqiang c2df1a807b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:29:00 +08:00
zhangqiang d131bdbadd 【适配】 2021-03-31 18:28:46 +08:00
jiaoyangna 5574c4bdac 灵兽特权 显示光效修改 2021-03-31 18:02:37 +08:00
jiaoyangna 0c43f05161 灵兽秘卷修改 2021-03-31 18:00:44 +08:00
ZhangBiao 9b533a698b 【适配】 2021-03-31 17:55:47 +08:00
jiaoyangna 39b457f544 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 17:55:39 +08:00
jiaoyangna 29d8059755 特效修改 2021-03-31 17:55:33 +08:00
zhangqiang 60353d6dbd 【归元优化】bug 2021-03-31 17:40:51 +08:00
zhangqiang c6425d9fe9 【称号坐骑时装】三界降魔 2021-03-31 17:30:05 +08:00
jiaoyangna d5c743e302 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 17:25:16 +08:00
jiaoyangna c8dd5845ac 成长礼包修改提交 2021-03-31 17:25:11 +08:00
ZhangBiao d970a91c95 【三界除魔】入口消失修复
(cherry picked from commit 31f1354b19)
2021-03-31 17:01:50 +08:00
ZhangBiao c1276ff0c4 【十五日登陆】界面 2021-03-31 17:00:35 +08:00
ZhangBiao 31f1354b19 【三界除魔】入口消失修复 2021-03-31 16:59:56 +08:00
jiaoyangna 14e2e0dd2a 挑战特权商店特效显示 2021-03-31 16:09:15 +08:00
zhangqiang 7102efae35 【车迟斗法】当前排名奖励箱子和奖励列表箱子内容不一样 2021-03-31 15:58:47 +08:00
ZhangBiao 38e4f42b7e 【十五日登陆】 2021-03-31 15:52:11 +08:00
zhangqiang c5a233df09 【称号坐骑时装】逍遥游 2021-03-31 15:39:40 +08:00
ZhangBiao 1c2f1d23c0 【十五日登陆】开坑 2021-03-31 15:02:04 +08:00
jiaoyangna ce617c94be 累计充值修改提交 2021-03-31 14:50:11 +08:00
jiaoyangna fbe2dc4769 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:43:11 +08:00
jiaoyangna 2fa125f70e 特权礼包特效修改 2021-03-31 14:43:08 +08:00
ZhangBiao 5142db7d00 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:33:11 +08:00
ZhangBiao c287216995 【适配】限时神装 2021-03-31 14:33:01 +08:00
gaoxin 50fcc0e03b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:29:26 +08:00
gaoxin 35ed5c2854 【挂机】修复关卡未解锁时按钮状态显示错误的问题 2021-03-31 14:28:57 +08:00
jiaoyangna 6af6f89c18 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:25:47 +08:00
jiaoyangna 43da7e2d51 十绝阵提交 2021-03-31 14:25:43 +08:00
ZhangBiao 94714c1ce4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 13:32:44 +08:00
ZhangBiao beee0ed0b3 【适配】无尽副本 2021-03-31 13:32:23 +08:00
zhangqiang 3b7b310c8b 【适配】 2021-03-31 12:00:55 +08:00
jiaoyangna 9350e899f9 特权礼包倒计时修改提交 2021-03-31 11:55:16 +08:00
jiaoyangna c2f1f923ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 11:27:09 +08:00
jiaoyangna 8c87d221fb 活动 动态加载改名 2021-03-31 11:26:55 +08:00
zhangqiang d2ab50c096 【特权优化】公会漏提 2021-03-31 11:20:45 +08:00
ZhangBiao 18dc0e7d0f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 10:37:50 +08:00
ZhangBiao 210a2069a5 【福星高照】拍脸修改 2021-03-31 10:28:48 +08:00
zhangqiang 81c7353e3e 【特权优化】vip漏提 2021-03-31 10:17:36 +08:00
zhangqiang 4c7bd53d20 【称号坐骑时装】战力向后的发送请求 2021-03-31 10:16:52 +08:00
jiaoyangna f30b4ea7eb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:59:05 +08:00
jiaoyangna 965f9c19e9 特权添加时间 2021-03-30 22:59:01 +08:00
ZhangBiao 6a89c381f1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:42:30 +08:00
ZhangBiao afcfa71db7 【福星高照】不关闭修复 2021-03-30 22:42:17 +08:00
zhangqiang 8bff7d2ab9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:37:57 +08:00
zhangqiang d9e3aa939d 【称号坐骑时装】 2021-03-30 22:37:45 +08:00
jiaoyangna dea7c12ded 层级报错 修改 2021-03-30 22:36:31 +08:00
jiaoyangna 3684b8fec1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:29:07 +08:00
jiaoyangna e9803f2760 文字错乱修改 2021-03-30 22:28:56 +08:00
zhangqiang 0370fb5610 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:22:13 +08:00
zhangqiang 40cc3683f9 【称号坐骑时装】中地图修改 2021-03-30 22:22:01 +08:00
jiaoyangna b7a0cca0fe 成长基金修改提交 2021-03-30 22:19:54 +08:00
jiaoyangna 6a16612ab1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:07:05 +08:00
jiaoyangna c69cc0cc14 每日充值显示错误修改 2021-03-30 22:06:59 +08:00
ZhangBiao d4b843d972 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:03:59 +08:00
ZhangBiao 4dcdd67648 【极速探索优化】更改极速探索界面,突出激活探索特权的按钮 2021-03-30 22:01:58 +08:00
zhangqiang ecf18e4b5a 【称号坐骑时装】大地图修改 2021-03-30 21:11:27 +08:00
jiaoyangna ed6e825266 去掉限时抢购 2021-03-30 21:04:48 +08:00
jiaoyangna ad24255948 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 21:02:36 +08:00
gaoxin 41c646817b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 20:46:55 +08:00
gaoxin 6e34c88fa5 【人物信息栏】修复战力刷新不及时的问题 2021-03-30 20:46:47 +08:00
jiaoyangna ef9d80e9b0 刷新资源 提交 2021-03-30 20:44:24 +08:00
jiaoyangna 0494e55215 Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
2021-03-30 20:41:32 +08:00
jiaoyangna 833aaec022 活动 提交 2021-03-30 20:35:53 +08:00
wangzhenxing 1a3086a2e3 【战斗】==============被动168 修改 bugId: 1014123 2021-03-30 20:33:39 +08:00
jiaoyangna 1465efa8b2 活动 提交 2021-03-30 20:32:05 +08:00
ZhangBiao 98a49ad693 Merge branch 'china/dev' into 0活动开发聚集地/福星高照 2021-03-30 20:28:12 +08:00
ZhangBiao 2984f6f63b 【注释】注释部分log 2021-03-30 20:27:40 +08:00
gaoxin 1973afd058 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 20:23:06 +08:00
gaoxin c88cd5b7e1 【主界面】扩大场景的显示范围 2021-03-30 20:22:57 +08:00
ZhangBiao 62a064b33e Merge branch 'china/dev' into 0活动开发聚集地/福星高照 2021-03-30 20:21:32 +08:00
zhangqiang d6c61b7a11 【归元修改】向后的发送战力改变 2021-03-30 20:20:42 +08:00
ZhangBiao 9ed1f4f8c2 【福星高照】增加拍脸 2021-03-30 20:20:12 +08:00
zhangqiang ea9d0ba287 【称号坐骑时装】 激活时 向后的发送战力改变 2021-03-30 20:20:00 +08:00
jiaoyangna 23b46ba218 活动 修改提交 2021-03-30 20:17:26 +08:00
gaoxin c2a5c2dc17 【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i 2021-03-30 19:54:19 +08:00
zhangqiang cfaeff6759 【特权优化】 vip 公会 vip 升级战力提升 2021-03-30 19:49:49 +08:00
zhangqiang 365a694eca 【称号坐骑时装】 跳章节修改 2021-03-30 19:18:32 +08:00
JieLing d481718145 Merge branch 'xma/dev' into master_xma_local 2021-03-30 19:02:16 +08:00
gaoxin 47c84d8c79 【bug】修复好友请求无法正常显示的问题 2021-03-30 19:01:40 +08:00
ZhangBiao d61c55d24d Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 18:55:35 +08:00
ZhangBiao 685ace078a 【福星高照】增加协议 2021-03-30 18:50:15 +08:00
gaoxin 8161aca202 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:42:38 +08:00
gaoxin 3cc0b51edd 【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题 2021-03-30 18:42:30 +08:00
jiaoyangna c2fac79eca 活动 提交 2021-03-30 18:26:10 +08:00
jiaoyangna d860db875d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:19:12 +08:00
jiaoyangna 7d9a5a62ba 天书秘卷 提交 2021-03-30 18:18:16 +08:00
zhangqiang 127a019a1b 【归元修改】漏提 2021-03-30 18:13:05 +08:00
gaoxin 202658d6d9 【特权优化】将界面顶部的特权等级移回 2021-03-30 18:10:39 +08:00
ZhangBiao e3fb9025a9 【福星高照】提交 2021-03-30 17:53:01 +08:00
gaoxin 81a87576a3 【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失 2021-03-30 17:44:44 +08:00
gaoxin 59fdb6d2aa Merge remote-tracking branch 'origin/xma/dev' into master_xma_local 2021-03-30 17:43:39 +08:00
gaoxin 1689489c3c 【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失 2021-03-30 17:43:22 +08:00
zhangqiang aabe3e082f 【归元修改】资源提交 2021-03-30 17:31:44 +08:00
wangzhenxing 33852141c6 【战斗】============被动245 去除 是不是追加技能得判断 2021-03-30 17:27:37 +08:00
gaoxin 03da04762b Merge remote-tracking branch 'origin/xma/dev' into master_xma_local 2021-03-30 17:26:16 +08:00
gaoxin 187ec35fbd 【GM】修改获取战斗数据的GM服务器地址 2021-03-30 17:25:03 +08:00
wangzhenxing 3fc6c20439 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 17:17:47 +08:00
zhangqiang 82b1de6537 【称号坐骑时装】飘战力 快捷跳转 2021-03-30 17:17:11 +08:00
wangzhenxing cda352d46e 【战斗】==========选择对位目标逻辑修改 2021-03-30 17:17:10 +08:00
ZhangBiao d3d363762b 【福星高照】完成 2021-03-30 16:55:45 +08:00
zhangqiang 9faf244e40 【归元修改】 神将 法宝 归元修改 2021-03-30 16:36:00 +08:00
wangzhenxing 2e886d4524 【战斗】====清除盾效果添加破盾提示文字,清除免疫,持续伤害,控制效果添加清除提示;被动278修改;被动添加排序;控制效果结束修改 2021-03-30 16:34:17 +08:00
ZhangBiao ee778776a1 【福星高照】提交 2021-03-30 16:24:28 +08:00
jiaoyangna a0552233ae Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-03-30 16:15:49 +08:00
zhangqiang 54dec77b6b 【英雄升级特效显示修改】 2021-03-30 15:01:49 +08:00
ZhangBiao fd9fc05994 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 14:34:40 +08:00
ZhangBiao 289af5b209 【活动优化】青龙秘宝界面优化 2021-03-30 14:34:25 +08:00
jiaoyangna b67066cc66 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 14:22:46 +08:00