Commit Graph

8765 Commits (359ca6b299decca5ed2851f6d10d680146f0773a)

Author SHA1 Message Date
jiaoyangna 3a5e3cf17e 好感度提交 2021-09-26 21:32:04 +08:00
gaoxin 7b93cc9519 Revert "织女法宝图标和音频"
This reverts commit f8f07c0bea.
2021-09-26 21:26:31 +08:00
gaoxin d770ea347e Revert "bat Resource Commit:2021/09/24,11:02:09"
This reverts commit a807bb6cf5.
2021-09-26 21:23:05 +08:00
gaoxin ace42823db 【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题 2021-09-26 20:48:32 +08:00
gaoxin 2bce8547c7 【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害 2021-09-26 20:31:51 +08:00
jiaoyangna d39ef472dc 好感度提交 2021-09-26 20:23:08 +08:00
wangzhenxing 3ff3649284 【功能】======白金装备合成 最少显示信息修改 2021-09-26 20:03:14 +08:00
wangzhenxing 306ab999b9 [功能]=============白金装备合成红点修改 2021-09-26 19:47:18 +08:00
liujiaqi f8f07c0bea 织女法宝图标和音频 2021-09-26 19:13:15 +08:00
gaoxin f282fe046b 【白金装备】修改白金装备字体显示 2021-09-26 18:41:47 +08:00
gaoxin 54afaef65a 【GM】一键顶级装备红色一星装备生成错误 2021-09-26 17:43:38 +08:00
gaoxin e318ca197f 【GM】一键顶级装备,增加白金装备 2021-09-26 17:40:48 +08:00
ZhangBiao a565d94658 【御剑行】资源提交 2021-09-26 17:39:49 +08:00
gaoxin 8310c29aaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:38:39 +08:00
gaoxin b21e7efe0d 【角色信息】修复跳转到角色信息界面,点击左右箭头报错 2021-09-26 17:38:23 +08:00
wangzhenxing e763b6472b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:31:16 +08:00
wangzhenxing a3e1782007 【功能】==========白金装备合成提交 2021-09-26 17:30:35 +08:00
gaoxin e61dea0f4a 【白金装备】套装显示添加 2021-09-26 17:13:12 +08:00
jiaoyangna d7276eae64 战力修改提交 2021-09-26 15:23:33 +08:00
gaoxin e671673389 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 15:02:49 +08:00
gaoxin 59311a8d88 【跨服】算错了跨服前七天的事件 2021-09-26 15:02:33 +08:00
wangzhenxing e1c0ee1613 [战斗]====御甲条图片修改 2021-09-26 14:58:02 +08:00
wangzhenxing 221939e1ec [战斗]==========御甲条显示修改 2021-09-26 14:56:07 +08:00
jiaoyangna 330b36b55a 好感度等级修改 2021-09-26 14:21:22 +08:00
jiaoyangna e59f160387 好感度等级修改提交 2021-09-26 13:55:57 +08:00
gaoxin 6a71a972e9 【战斗力】关闭一些log 2021-09-26 11:18:38 +08:00
jiaoyangna 14b967185b 好感度提交 2021-09-26 10:18:51 +08:00
gaoxin cc68282fb8 【法宝升阶】修复战力提升文字显示错误 2021-09-26 10:16:00 +08:00
ZhangBiao f1dd5d195c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 10:08:38 +08:00
ZhangBiao 59e51aefef 【七界试炼】提交 2021-09-26 10:08:15 +08:00
gaoxin 9b67b9247b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 10:04:06 +08:00
gaoxin b318ed5678 【资源】部分界面战力文字换成评分 2021-09-26 10:03:50 +08:00
ZhangBiao 8f9743d127 【七界试炼】激活遗物提示,奖励遮盖 2021-09-26 10:01:37 +08:00
jiaoyangna 1152586ff1 好感度提交 2021-09-26 09:54:58 +08:00
ZhangBiao bac86d5ec8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 19:23:43 +08:00
liujiaqi cc33532a51 【资源】女儿国王皮肤音效 2021-10-01 18:06:48 +08:00
ZhangBiao 1a866b1068 【七界试炼】提交 2021-09-24 19:23:30 +08:00
gaoxin 8c76d476a2 【编队】修复保存编队接口名修改导致的报错 2021-09-24 17:49:32 +08:00
wangzhenxing d83cf97ae2 【战斗】==========被动93 307 309 351修改 2021-09-24 17:40:08 +08:00
ZhangBiao 1505647241 【七界试炼】框位不齐 2021-09-24 17:02:38 +08:00
ZhangBiao 35091621dc 【七界试炼】提交 2021-09-24 16:52:05 +08:00
ZhangBiao a823984187 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 16:47:19 +08:00
ZhangBiao 028f97c195 【七界试炼】红点和跳转i需改 2021-09-24 16:47:06 +08:00
yuanshuai 77a47432bf 【四象心法】强化按钮点击强化两次bug修改 2021-09-24 15:59:01 +08:00
yuanshuai ad8f5ac73e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:45:50 +08:00
yuanshuai 7f94f9e185 思想心法bug修改 2021-09-24 15:45:20 +08:00
wangzhenxing 34f52e18e7 [战斗]=====被动352 描述修改 2021-09-24 15:20:59 +08:00
wangzhenxing e8b7af1cf7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:14:29 +08:00
wangzhenxing 8ffd86ee19 Merge branch 'china/dev-c-battle' into china/dev
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-09-24 15:13:46 +08:00
ZhangBiao ff9d22e14d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:12:42 +08:00
ZhangBiao ce1a5f25ea 【七界试炼】奖励位置调整 2021-09-24 15:11:57 +08:00
wangzhenxing 8de85a24a4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:04:57 +08:00
gaoxin c15294b14c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 15:00:57 +08:00
gaoxin 5f3768e831 【新资源meta文件上传】 2021-09-24 15:00:44 +08:00
wangzhenxing 19f7984f01 [战斗]=============新增352被动 2021-09-24 14:59:54 +08:00
ZhangBiao c862eac46e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 14:57:14 +08:00
ZhangBiao b0e24676b3 【七界试炼】增加秘宝入口开启处理 2021-09-24 14:57:04 +08:00
wangzhenxing 9abf1ef390 Merge branch 'china/dev-c-battle' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c-battle
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-09-24 14:56:13 +08:00
wangzhenxing c573d83eeb 女儿国王特效资源提交 2021-09-24 14:53:47 +08:00
liujiaqi f89e16792e 【资源】女儿国王大小头像 2021-09-24 14:53:34 +08:00
gaoxin 4e441f4942 【资源】女儿国王默认动画添加 2021-09-24 14:53:04 +08:00
gaoxin 00db8bf660 【资源】女儿国王皮肤资源上传 2021-09-24 14:52:58 +08:00
wangzhenxing 48cc9357c1 [战斗]==========被动194修改 新增被动251 额外行动修改 2021-09-24 14:46:02 +08:00
jiaoyangna 136d872fbd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 14:20:32 +08:00
jiaoyangna 003583db7b 无尽副本报错修改 2021-09-24 14:19:50 +08:00
ZhangBiao 9ff1957ff7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 14:06:26 +08:00
ZhangBiao c9305b4247 【七界试炼】提交 2021-09-24 14:06:09 +08:00
liujiaqi 0b91f698c8 【资源】麒麟卡 2021-09-24 12:41:05 +08:00
liujiaqi 8531ab1c2e 【资源】坐骑icon 2021-09-24 12:40:57 +08:00
gaoxin 8fd74e7e99 【资源】坐骑麒麟live2d上传 2021-09-24 12:40:35 +08:00
gaoxin 5c3fb8408b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 11:07:21 +08:00
gaoxin ddb97196d9 【首充】金额改为special表配置 2021-09-24 11:05:39 +08:00
luyao 9e2f4e1512 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 11:02:53 +08:00
luyao a807bb6cf5 bat Resource Commit:2021/09/24,11:02:09 2021-09-24 11:02:09 +08:00
ZhangBiao 35e6c617fb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 10:28:10 +08:00
ZhangBiao 8bd1896aba 【七界试炼】敌方英雄展示修改 2021-09-24 10:27:56 +08:00
gaoxin 2473fb149a 【ID1018513】【魂印分解】选择多个魂印分解时就算紫色也会提示选择了金色,单个魂印分解时就算白金也不提示
【ID1018512】【魂印分解】列表拖动到底部,点击筛选页签,不回弹
2021-09-24 10:17:25 +08:00
gaoxin 65efa9336c 【魂印】修复神将恭送后没有重置魂印的穿戴状态,导致力战之躯魂印无法穿戴的问题 2021-09-23 20:59:44 +08:00
ZhangBiao a2d7bedb5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 19:47:32 +08:00
ZhangBiao d0c38ec9d7 【七界试炼】提交 2021-09-23 19:47:17 +08:00
gaoxin 65df3f1a37 【名字】添加名称正确性检测 2021-09-23 19:43:24 +08:00
gaoxin c3820f13ae 【编队】修复无法复制编队的问题 2021-09-23 19:42:45 +08:00
ZhangBiao 6ced770ef1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 19:23:37 +08:00
ZhangBiao 5af10faa57 【七界试炼】提交 2021-09-23 19:23:27 +08:00
gaoxin 0d76922c85 【编队】刷新编队时,保存编队的方法错误 2021-09-23 17:54:29 +08:00
jiaoyangna a255a6fb42 点击区域修改提交 2021-09-23 17:25:33 +08:00
jiaoyangna ee5182dced 玲珑宝镜领取状态修改提交 2021-09-23 16:59:30 +08:00
jiaoyangna fcae70ae04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:50:48 +08:00
jiaoyangna 80e2cab589 玲珑宝镜跳转修改提交 2021-09-23 16:50:24 +08:00
ZhangBiao 170d4886e3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:46:50 +08:00
ZhangBiao 93b3839727 【七界试炼】商店刷新事件 2021-09-23 16:46:35 +08:00
jiaoyangna ec8d3631d9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:46:16 +08:00
skuld 85f227ee8e bat Resource Commit:2021/10/12, 2:02:56 2021-10-12 02:02:56 +08:00
jiaoyangna 5b7b607725 主城玲珑宝镜入口提交 2021-09-23 16:21:51 +08:00
gaoxin 515294f16b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:17:09 +08:00
gaoxin 0f534367c5 【战斗力】不再计算编队老战斗力 2021-09-23 16:16:57 +08:00
luyao 1a2e24b96d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:13:14 +08:00
luyao ca6b5ebe7d bat Resource Commit:2021/09/23,16:11:26 2021-09-23 16:11:26 +08:00
ZhangBiao 9b24649f36 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:08:13 +08:00
ZhangBiao 0422b5c738 【七界试炼】提交 2021-09-23 16:08:02 +08:00
gaoxin ac88b50cae 【编队】修复打开四灵试炼编队报错 2021-09-23 16:05:18 +08:00
gaoxin 41aaab4d09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 15:52:30 +08:00
gaoxin f6c336e52f 【战斗力】添加一些log 2021-09-23 15:52:19 +08:00
gaoxin 1e011b560a 【跨服】开服前七天无法进入跨服 2021-09-23 15:52:01 +08:00
jiaoyangna 2e08cf7672 玲珑宝镜消耗道具添加加号 2021-09-23 15:50:32 +08:00
jiaoyangna 8f71700122 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 15:45:54 +08:00
jiaoyangna ef2d856bdf 玲珑宝镜预设调整 2021-09-23 15:45:41 +08:00
gaoxin e362321aa5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:54:28 +08:00
gaoxin b32183f20a 【玩家数据】添加服务器开启时间字段 2021-09-23 14:54:12 +08:00
ZhangBiao 524521d526 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:51:15 +08:00
ZhangBiao 016f0159e5 【七界试炼】提交 2021-09-23 14:51:04 +08:00
jiaoyangna ec18db0efb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:33:44 +08:00
jiaoyangna fb82580b37 玲珑商市修改提交 2021-09-23 14:33:31 +08:00
ZhangBiao fc03b71b84 【七界试炼】tijiao 2021-09-23 14:21:30 +08:00
ZhangBiao 524bd129bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:13:53 +08:00
ZhangBiao 9bac3f850e 【七界试炼】提交 2021-09-23 14:13:34 +08:00
jiaoyangna c3dfb94905 好感度协议提交 2021-09-23 13:47:41 +08:00
jiaoyangna e1abfa42e5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 12:30:37 +08:00
jiaoyangna 0705837511 玲珑宝镜间隔修改提交 2021-09-23 12:30:22 +08:00
ZhangBiao ad3ea41597 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 12:02:10 +08:00
ZhangBiao 5c11a67393 【七界试炼】修改提交 2021-09-23 12:01:58 +08:00
jiaoyangna a1a3eda93c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 11:17:01 +08:00
skuld 04344165e4 bat Resource Commit:2021/10/11,18:14:36 2021-10-11 18:14:36 +08:00
jiaoyangna 09a71048c7 红点检测提交 2021-09-23 11:16:46 +08:00
wangzhenxing cbb22260f3 Merge branch 'china/dev-c-battle' into china/dev 2021-09-23 11:02:19 +08:00
wangzhenxing fbaca4e989 [战斗]====添加间接治疗得方法 2021-09-23 10:51:21 +08:00
jiaoyangna 6b6c6b48db Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 09:51:59 +08:00
jiaoyangna d6002c5242 玲珑报镜十连修改提交 2021-09-23 09:51:45 +08:00
gaoxin 913d3c14a7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:54:52 +08:00
gaoxin 4f9cc3ee44 【奖励界面】部分界面胡乱显示经验调 2021-09-22 20:54:46 +08:00
jiaoyangna a8eeec83f6 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-22 20:53:08 +08:00
jiaoyangna 529094b6ad 好感度第一次提交 2021-09-22 20:47:13 +08:00
jiaoyangna ca74a5c158 玲珑宝镜动画修改 2021-09-22 20:39:06 +08:00
jiaoyangna 7e5061844b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:23:45 +08:00
jiaoyangna af3f2b8f32 添加玲珑商市跳转 2021-09-22 20:22:59 +08:00
yuanshuai bdeade9d71 【四象心法】点击消耗道具显示详情 2021-09-22 20:08:43 +08:00
yuanshuai d8e88d4fba 【四象心法】点击消耗道具显示详情 2021-09-22 20:08:27 +08:00
jiaoyangna 4910773749 玲珑宝镜修改提交 2021-09-22 20:04:08 +08:00
jiaoyangna 0805ef4ebc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:02:01 +08:00
ZhangBiao c29ad91a4c 【七界试炼】修改提交 2021-09-22 19:56:13 +08:00
ZhangBiao 5a7e0a4dc8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 19:38:32 +08:00
ZhangBiao 32585cec01 【七界试炼】增加怪物详情界面 2021-09-22 19:38:16 +08:00
gaoxin 3546e9ac7c 【数数】报错修改 2021-09-22 18:05:57 +08:00
gaoxin 5d0d24066a 【数数】关闭崩溃上报事件 2021-09-22 18:03:07 +08:00
jiaoyangna 2f16f43379 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 18:02:32 +08:00
jiaoyangna aeecd125e0 【ID1010383】
【优化】玲珑宝镜新增进度条奖励
2021-09-22 17:34:16 +08:00
gaoxin 8d9ac3bb69 【打包工具】修改生成Apk的包名 2021-09-22 17:07:51 +08:00
ZhangBiao 042df03091 【七界试炼】零点不刷新修改 2021-09-22 16:45:23 +08:00
ZhangBiao 5f80bbb7a1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 16:26:04 +08:00
ZhangBiao 0b9055110d 【七界试炼】红点 2021-09-22 16:25:29 +08:00
yuanshuai 573cb8a8e3 误操作 2021-09-22 16:17:09 +08:00
gaoxin ddf0e9b981 【资源名修改后自动生成文件提交】 2021-09-22 16:01:11 +08:00
gaoxin 36dff25c3e 【资源名重复修改】 2021-09-22 15:55:19 +08:00
gaoxin f607ad73bb Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-22 15:42:50 +08:00
gaoxin 579b566935 【四象心法】加入新的战斗力计算 2021-09-22 15:42:28 +08:00
yuanshuai b99e643da5 四象心法预设合并 2021-09-22 15:41:39 +08:00
yuanshuai 82937ae35e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 15:39:24 +08:00
yuanshuai ab7570f3bb .meta 2021-09-22 15:39:07 +08:00
gaoxin 34f3f42a04 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
2021-09-22 15:36:10 +08:00
ZhangBiao 371c0fc080 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-09-22 15:21:59 +08:00
yuanshuai e33fad0054 最新协议提交 2021-09-22 15:20:25 +08:00
ZhangBiao dc2343073d 【七界】资源提交 2021-09-22 15:20:09 +08:00
ZhangBiao 40fb962879 【七界试炼】合并后提交 2021-09-22 15:19:27 +08:00
yuanshuai b145159311 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 15:13:12 +08:00
yuanshuai db18313495 Merge branch '0功能/四象心法' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
#	Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto.proto
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-09-22 15:12:32 +08:00
gaoxin fa85ecb870 Revert "Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题""
This reverts commit 0e86945c53.
2021-09-22 14:59:34 +08:00
ZhangBiao cea14746f8 【七界试炼】提交 2021-09-22 13:33:48 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
gaoxin bc659b68f8 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
2021-09-22 10:54:15 +08:00
gaoxin e5af89fac9 Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
2021-09-22 10:37:42 +08:00
jiaoyangna 488753ab83 四灵编队修改提交
(cherry picked from commit 191603b77f)
2021-09-18 19:19:30 +08:00
jiaoyangna 71b380cdd2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-18 18:55:21 +08:00
jiaoyangna 4e5ef30243 在线四灵编队修改提交 2021-09-18 18:55:07 +08:00
gaoxin 2ca77d75ef 【易经宝库】修服选中大奖后次数显示异常 2021-09-18 18:40:21 +08:00
jiaoyangna a628176640 四灵 修改提交
(cherry picked from commit 675cda9b4d)
2021-09-18 18:26:21 +08:00
ZhangBiao 47485caeda 【七界试炼】无免费次数按钮逻辑修改 2021-09-18 18:23:48 +08:00
jiaoyangna 4a494fac11 在线刷新一下编队 2021-09-18 18:19:45 +08:00
ZhangBiao 1ddc89ad54 【七界试炼】提交 2021-09-18 18:18:22 +08:00
jiaoyangna 3f24f4cd86 四灵试炼 修改提交 2021-09-18 17:58:28 +08:00
jiaoyangna 02f1888f3f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-18 17:07:42 +08:00
jiaoyangna 13e0865cc2 四灵助战报错修改 2021-09-18 17:07:01 +08:00
ZhangBiao 634f78d3c5 【七界试炼】提交 2021-09-18 16:52:06 +08:00
gaoxin e3f4808936 【易经宝库】选择奖励界面显示错误 2021-09-18 16:32:52 +08:00
ZhangBiao 20ed8d5928 【七界试炼】密保名称 2021-09-18 16:14:46 +08:00
gaoxin a3ff527bc9 【易经宝库】选择奖励界面,选中奖励后的显示效果优化 2021-09-18 16:14:03 +08:00
gaoxin 50f2a73898 【寻宝迷踪】修复界面刷新不及时的问题 2021-09-18 15:53:13 +08:00
yuanshuai 055f77d1c0 .meta 2021-09-18 15:45:03 +08:00
yuanshuai a48bf3027d .meta 2021-09-18 15:44:29 +08:00
yuanshuai 0d31e6b0f8 ,meta 2021-09-18 15:44:09 +08:00
yuanshuai 6b2eaf6cca 【四象心法】bug修改 2021-09-18 15:43:32 +08:00
gaoxin 7e954b997a 【易经宝库】修复查看剩余奖励报错 2021-09-18 15:15:22 +08:00
ZhangBiao 35e0c96748 【七界试炼】提交 2021-09-18 15:04:32 +08:00
gaoxin 39b7267239 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-18 14:19:31 +08:00
gaoxin a80d16fbda 【易经宝库】修改选择奖励界面的排序规则 2021-09-18 14:19:26 +08:00
jiaoyangna 2bfe122214 易经宝库选择报错修改提交
(cherry picked from commit 8ae7a3174f)
(cherry picked from commit 20ccbed3c9)
2021-09-18 13:43:36 +08:00
gaoxin a3bc278624 【配置】获取配置前,拉取更新 2021-09-18 12:02:16 +08:00
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00
ZhangBiao a15bd40b96 【寻宝迷踪】跳转惊喜礼盒 2021-09-18 11:33:46 +08:00
wangzhenxing fb7a074e2a yuxushangdian commit 2021-09-18 11:26:54 +08:00
ZhangBiao b1265379f9 【七界试炼】排行榜和开启时间显示 2021-09-18 11:24:11 +08:00