Commit Graph

7851 Commits (834cdf87da0f682239c4eae899c00f0ef058589f)

Author SHA1 Message Date
jiaoyangna ab722baa35 变身卡修改提交 2021-12-06 14:05:43 +08:00
wangzhenxing acc1be3885 【战斗】=====buff图标显示销毁修改 2021-12-06 13:18:50 +08:00
ZhangBiao b433178b6e 【修行】结构更改 2021-12-06 11:57:08 +08:00
ZhangBiao 4434f9b615 【连购礼包】 2021-12-06 11:38:52 +08:00
ZhangBiao 3046512f77 【连购礼包】提交 2021-12-06 11:30:46 +08:00
ZhangBiao 981baa0fed Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 11:23:42 +08:00
ZhangBiao d5bd38be25 【连购礼包】提交 2021-12-06 11:23:31 +08:00
jiaoyangna bc886f8bf3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 11:11:36 +08:00
jiaoyangna 0ca366cdf4 添加加号提交 2021-12-06 11:11:16 +08:00
ZhangBiao 1287c8f37c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 11:02:29 +08:00
ZhangBiao 7a43c51a48 【连购礼包】每日特惠修改 2021-12-06 11:02:15 +08:00
jiaoyangna 262f42a11b 文字修改提交 2021-12-06 10:26:43 +08:00
jiaoyangna 7e1cac4cbe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 09:58:25 +08:00
jiaoyangna 6309159f77 方寸寻宝修改提交 2021-12-06 09:58:04 +08:00
wangzhenxing e9f9010c12 【战斗】======被动401修改 2021-12-06 09:40:51 +08:00
wangzhenxing 010d68819f [战斗]=====buff显示id修改 2021-12-03 18:53:48 +08:00
wangzhenxing 2f7e5421a8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 18:20:06 +08:00
wangzhenxing 40e639098b [战斗]======仙音环绕修改 2021-12-03 18:19:29 +08:00
jiaoyangna b19801639d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 18:03:53 +08:00
jiaoyangna 660bbdf997 方寸寻宝修改提交 2021-12-03 18:03:36 +08:00
wangzhenxing b9763ad25e 【战斗】=====变身卡提交 2021-12-03 17:17:47 +08:00
ZhangBiao 7348534847 【去除多余活动信息】 2021-12-03 16:46:40 +08:00
ZhangBiao f3f74c5ff1 【跨服战红点】灵脉被打跨服战没红点 2021-12-03 16:09:33 +08:00
ZhangBiao bf7dd87000 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包 2021-12-03 13:25:40 +08:00
ZhangBiao 8e7afd757d 【连购礼包】提交 2021-12-03 13:21:15 +08:00
wangzhenxing 94fd5fb5cf 【战斗】=======被动130修改 2021-12-03 10:27:41 +08:00
ZhangBiao ed5e0f6ab1 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包 2021-12-03 10:00:31 +08:00
ZhangBiao 4c7b379ce7 【灵脉秘境】1号灵脉的灵气数值超框 2021-12-02 19:49:49 +08:00
ZhangBiao ebff38ffc4 【连购礼包】提交 2021-12-02 19:36:28 +08:00
wangzhenxing d424af4e4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 17:43:00 +08:00
wangzhenxing bbef7796ca [战斗]=======第四期神魂 2021-12-02 17:42:31 +08:00
ZhangBiao 55f2e6e783 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-12-02 17:16:00 +08:00
ZhangBiao 4d1799a124 【连购礼包】提交 2021-12-02 17:13:33 +08:00
ZhangBiao bc69e64b81 【连购礼包】提交 2021-12-02 16:27:24 +08:00
jiaoyangna 43d40d90e1 【ID1019316】
【神将归元】7星玉帝归元弹窗显示5星,实际只是显示问题
2021-12-02 15:55:08 +08:00
jiaoyangna 1253466912 天地烘炉提交 2021-12-02 15:18:56 +08:00
ZhangBiao f431eea90c 【连购礼包】提交 2021-12-02 14:03:38 +08:00
ZhangBiao cf971541e1 【大闹天宫】无法挑战修改 2021-12-02 10:35:06 +08:00
jiaoyangna e7cc7ee41e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-01 17:02:41 +08:00
jiaoyangna 40fcfcdfc2 化身描述修改 2021-12-01 17:02:25 +08:00
ZhangBiao c637166494 【灵兽宝阁】确认框错误修改 2021-12-01 16:55:05 +08:00
ZhangBiao 1725c1dc28 Revert "【战斗】白片尝试修改"
This reverts commit 0f8a995163.
2021-12-01 13:58:49 +08:00
ZhangBiao 0f8a995163 【战斗】白片尝试修改 2021-12-01 13:57:11 +08:00
ZhangBiao 1805fe0848 【装备】出售单个装备报错修改 2021-12-01 10:16:42 +08:00
gaoxin ba0680eac6 【战斗】皮肤朝向修改 2021-11-30 23:14:06 +08:00
wangzhenxing 898f3a9b99 [立绘朝向]=======英雄列表初始化立绘朝向修改 2021-11-30 22:53:49 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
ZhangBiao 9e83ce264d 【引导】升级后不弹引导修改 2021-11-30 15:43:02 +08:00
jiaoyangna bd379c4114 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-30 13:23:44 +08:00
jiaoyangna 12fb7447cc 坐骑合成修改 2021-11-30 13:23:29 +08:00
ZhangBiao 239d5bbb36 【log】日志调整 2021-11-30 11:19:28 +08:00
wangzhenxing bdb02e9fa4 [战斗]=====皮肤立绘朝向修改 2021-11-30 11:04:25 +08:00
wangzhenxing e1d75c6274 [战斗]=====增加目标筛选条件 2021-11-30 09:58:27 +08:00
jiaoyangna 5463dbe559 提示修改提交 2021-11-30 09:35:37 +08:00
ZhangBiao db1fd8cc9e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 18:26:02 +08:00
ZhangBiao 64e7aaac10 【百宝商会、灵兽特惠】提交 2021-11-29 18:25:39 +08:00
wangzhenxing a60c74720c 【战斗】=====查找逻辑修改 2021-11-29 18:16:49 +08:00
wangzhenxing 0cef7683ba [战斗]======效果137修改 立绘朝向修改 2021-11-29 17:53:17 +08:00
wangzhenxing ac32149aa8 [立绘朝向]=====皮肤,敌方立绘朝向修改 2021-11-29 17:07:28 +08:00
jiaoyangna 93eb328ddf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 16:41:34 +08:00
jiaoyangna 2e3fdd5e56 颜色修改提交 2021-11-29 16:41:04 +08:00
ZhangBiao 36dbd13c7d Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 16:37:36 +08:00
ZhangBiao 65461a4014 【灵兽特惠】跳转错误修改 2021-11-29 16:35:40 +08:00
jiaoyangna bce0b9b9ff Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 16:35:39 +08:00
jiaoyangna ff48e4c11f 天地烘炉修改提交 2021-11-29 16:35:23 +08:00
wangzhenxing ea7e7d31be 【战中表现】======身外化身表现优化 2021-11-29 16:19:43 +08:00
wangzhenxing 6279110ddd 【战斗】=========目标选择逻辑修改 2021-11-29 16:07:32 +08:00
jiaoyangna 9070ad04ca 化身属性排序修改 2021-11-29 14:45:23 +08:00
jiaoyangna fbf47dbd61 添加天地烘炉读表设置 2021-11-29 14:39:43 +08:00
jiaoyangna c71616be27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 14:39:15 +08:00
jiaoyangna dae57bb8ee 添加天地洪炉法宝碎片读表设置 2021-11-29 14:38:57 +08:00
ZhangBiao b90afb39f2 【灵兽特惠】提交 2021-11-29 14:08:07 +08:00
ZhangBiao 38f70b2c8d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 13:41:02 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
wangzhenxing 2c6282e883 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 13:21:52 +08:00
wangzhenxing 1eb6115bc9 [角色朝向]=======立绘朝向修改 2021-11-29 13:21:23 +08:00
jiaoyangna d931fa07f8 身外化身重复修改提交 2021-11-29 10:14:52 +08:00
jiaoyangna c2638629e7 化身两个修改提交 2021-11-29 09:40:41 +08:00
gaoxin 030fea312a 【立绘】立绘回收时,方向还原 2021-12-02 04:34:30 +08:00
gaoxin b8137b0d7c 【点将台】尝试修复山河社稷图黑屏 2021-12-02 04:33:57 +08:00
gaoxin e2c42fcdb5 【关卡】修复剧情关卡后按钮状态刷新不及时的问题 2021-12-02 04:18:13 +08:00
gaoxin 0efa821585 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:44:34 +08:00
gaoxin 0d1c025624 【活动】连续礼包,添加 2021-12-02 01:44:29 +08:00
gaoxin 28538e89b0 【GM】添加剧情测试的GM 2021-12-02 01:13:52 +08:00
jiaoyangna 9a61491b90 资源条修改提交 2021-11-27 18:28:11 +08:00
jiaoyangna f036036f09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 18:13:03 +08:00
jiaoyangna 5fb0af7e00 颜色修改提交 2021-11-27 18:12:37 +08:00
jiaoyangna da2cff54a4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:59:23 +08:00
gaoxin c8a1f45b41 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:07:06 +08:00
gaoxin 8a960ece3b 【关卡】添加剧情关卡 2021-12-02 01:06:34 +08:00
jiaoyangna 07057901bc 十连抽修改 2021-11-27 17:59:07 +08:00
wangzhenxing dcd16e5450 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:50:09 +08:00
ZhangBiao 27abdede9d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:21:33 +08:00
ZhangBiao 14b6087d77 【神将来源】获取途径报错修改 2021-11-27 17:21:24 +08:00
wangzhenxing 58f41eb758 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:18:38 +08:00
wangzhenxing dd248f37f6 [角色朝向]======进阶展示,皮肤显示,好感度 2021-11-27 17:18:04 +08:00
jiaoyangna dfb79c03d7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:14:47 +08:00
jiaoyangna 37de4c4450 文字显示报错修改 2021-11-27 17:13:28 +08:00
ZhangBiao a8e619b8c6 【乾坤宝盒】去除珍奇宝阁 2021-11-27 17:03:58 +08:00
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
wangzhenxing d099ddafa3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:35:13 +08:00
ZhangBiao 1775784bcd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:34:59 +08:00
wangzhenxing bc39b34a73 [战中表现]=====角色释放技能表现位置修改 2021-11-27 16:34:46 +08:00
gaoxin 58ce5ad4d8 【战斗】测试战斗跳过按钮遮挡 2021-11-27 16:28:54 +08:00
wangzhenxing 0ce834e220 【立绘朝向】=====备战界面修改,战斗记录界面灵兽显示主角修改 2021-11-27 16:25:21 +08:00
wangzhenxing cbcead2f50 【身外化身】=======化身位置修改 2021-11-27 15:45:21 +08:00
jiaoyangna 12e091408d 层级修改 2021-11-27 15:37:48 +08:00
ZhangBiao d8956e0fe2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:31:17 +08:00
ZhangBiao b83dc76f7b 【灵兽特惠】时间显示修改 2021-11-27 15:30:49 +08:00
jiaoyangna 904adf1d16 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:30:02 +08:00
jiaoyangna e9862a7046 抽卡提示修改提交 2021-11-27 15:29:46 +08:00
wangzhenxing d639b2d29b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:15:00 +08:00
wangzhenxing 85a12ae9d8 [身外化身]========身外化身立绘朝向修改 2021-11-27 15:14:22 +08:00
gaoxin d253668aef 【战斗】修复按钮被立绘遮挡 2021-11-27 15:13:35 +08:00
jiaoyangna ecc3aff607 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 14:31:17 +08:00
jiaoyangna 0c6ff17ddd 修改提交 2021-11-27 14:30:51 +08:00
wangzhenxing fd81a89c96 【战斗表现】========变身卡展示位置修改 2021-11-27 13:56:37 +08:00
jiaoyangna 767d4589c7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 13:54:56 +08:00
jiaoyangna 04987414e9 图片修改提交 2021-11-27 13:54:36 +08:00
wangzhenxing 3c22a1ef6c [立绘朝向]======静态立绘朝向改回原样 2021-11-27 13:17:36 +08:00
wangzhenxing c80968098c 【立绘朝向】=============装备界面立绘朝向 2021-11-27 13:01:27 +08:00
gaoxin 060a380305 【战斗】跳过按钮进度显示优化 2021-11-26 19:41:10 +08:00
jiaoyangna 83946b29f2 变身卡详情修改提交 2021-11-26 19:37:27 +08:00
jiaoyangna f6c94a3cfe 变身卡详情提交 2021-11-26 19:36:20 +08:00
jiaoyangna 97c23fb3cb 变身卡自选箱修改提交 2021-11-26 18:51:56 +08:00
jiaoyangna 5bba220ad5 添加跳转 2021-11-26 18:30:08 +08:00
jiaoyangna 80fb3c9108 添加tips 2021-11-26 18:20:03 +08:00
jiaoyangna 129e2e5c56 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 18:10:18 +08:00
jiaoyangna 410fb55f66 天地烘炉提交 2021-11-26 18:10:02 +08:00
wangzhenxing 587a5cfc2e [战斗]=======133 136 137效果修改 2021-11-26 18:05:16 +08:00
jiaoyangna 4a82bcc664 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:54:55 +08:00
jiaoyangna 1a40cfba00 天地烘炉提交 2021-11-26 17:54:35 +08:00
gaoxin 0ddf804234 【战斗】战斗结构调整 2021-11-26 17:20:28 +08:00
wangzhenxing a6bf54daaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:08:20 +08:00
jiaoyangna 2814265ba7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:06:24 +08:00
jiaoyangna 5542212cc1 天地烘炉提交 2021-11-26 17:04:54 +08:00
wangzhenxing 13e0ab29ba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 16:56:01 +08:00
wangzhenxing 69e30d908c [立绘朝向]===============我方立绘展示朝向修改 2021-11-26 16:55:13 +08:00
ZhangBiao ed45f56479 【主角】未到开启等级有红点 2021-11-26 16:44:01 +08:00
ZhangBiao 7e1039bf3b 【灵脉秘境】特效 2021-11-26 15:43:39 +08:00
ZhangBiao 5c7ba2529d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 15:15:23 +08:00
ZhangBiao b33ee1b006 【灵脉秘境】特效提交 2021-11-26 15:15:10 +08:00
gaoxin efe08520b9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 14:28:04 +08:00
gaoxin a9a402bd42 【战斗】再次优化护盾类特效的显示层级 2021-11-26 14:27:58 +08:00
gaoxin bb685191dd 【优化】设置物品显示的方法改为通用方法 2021-11-26 14:27:24 +08:00
gaoxin 62097d4d05 【红包】时间显示方法修改 2021-11-26 14:26:04 +08:00
jiaoyangna b63b619426 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 14:11:37 +08:00
jiaoyangna b6bcd50dd3 身外化身修改提交 2021-11-26 14:11:23 +08:00
gaoxin 6b199a8b5a 【战斗】敌方怒气穿透 2021-11-26 14:06:19 +08:00
gaoxin 15b3718dd8 【测试战斗】添加一些特效配置的参数 2021-11-26 13:59:18 +08:00
gaoxin 21e7638a75 【特效】优化点对点特效的显示时间,优化特效层级错误的问题 2021-11-26 13:58:59 +08:00
gaoxin 71aa002b13 【战斗】前置特效添加延时 2021-11-26 13:58:24 +08:00
jiaoyangna c5fddcdf7a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 13:19:11 +08:00
jiaoyangna 14b54c7d5e 变身卡名字颜色修改 2021-11-26 13:18:45 +08:00
wangzhenxing 1da1d1457b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 13:08:37 +08:00
wangzhenxing 180d76f3b9 【战斗】========主角技能gm添加字段 2021-11-26 13:07:49 +08:00
jiaoyangna 838d7108bd 添加资源条 2021-11-26 13:07:45 +08:00
jiaoyangna 0d18d4595e 测试按钮关闭 2021-11-26 13:05:07 +08:00
jiaoyangna def89bf7e3 身外化身提交 2021-11-26 12:51:52 +08:00
jiaoyangna 2212df06ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:39:24 +08:00
jiaoyangna 1e17151d7f Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-11-26 11:35:57 +08:00
jiaoyangna 964a1b4fde Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:34:57 +08:00
jiaoyangna b78e2335fa 身外化身提交 2021-11-26 11:34:25 +08:00
wangzhenxing bb1402d5e7 [战斗]======立绘方向修改 2021-11-26 11:24:46 +08:00
ZhangBiao 4c7268b11a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:09:30 +08:00
ZhangBiao c8fa05d5a0 【固定活动】提交 2021-11-26 11:09:22 +08:00
jiaoyangna c0c8a6710c 身外化身提交 2021-11-26 11:08:48 +08:00
gaoxin 5557795658 【轩辕宝镜】偶现跨0点报错 2021-11-26 10:53:49 +08:00
gaoxin f5f5a2477d 【战斗】怒气层级错误 2021-11-26 10:33:30 +08:00
gaoxin 878e8b095a 【森罗幻境】修复老虎机小游戏后音效播放错误 2021-11-26 10:29:12 +08:00
gaoxin 3a574880ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 10:19:35 +08:00
gaoxin ad3ca2e0d2 【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型 2021-11-26 10:19:29 +08:00
ZhangBiao f83bffaf75 【固定活动】提交 2021-11-26 10:16:46 +08:00
ZhangBiao 7f525511c8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 09:54:21 +08:00
ZhangBiao 45df1fb982 【寻仙招募】增加心愿阵营条 2021-11-26 09:54:12 +08:00
wangzhenxing 5449b2357d [战斗]=====效果132修改 2021-11-26 09:36:41 +08:00
jiaoyangna 8a3ca0cb97 天地洪炉提交 2021-11-25 19:06:20 +08:00
jiaoyangna 34949242a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-11-25 18:57:48 +08:00
jiaoyangna fd22b5a87f 天地洪炉提交 2021-11-25 18:55:20 +08:00
ZhangBiao db5627ab24 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 18:51:46 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
wangzhenxing 7949e8c21c 【战斗】========灵兽卡面翻转提交 2021-11-25 18:47:53 +08:00
wangzhenxing 6927b52365 [战斗]=======主角变身卡添加gm 2021-11-25 18:36:00 +08:00
ZhangBiao a8f666e901 【删除活动类型43】 2021-11-25 17:27:02 +08:00
ZhangBiao cb331c612e 【删除活动类那个43】 2021-11-25 16:51:35 +08:00
ZhangBiao d40b07138c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 16:16:48 +08:00
ZhangBiao bd4ce88486 【乾坤宝盒】报错修改 2021-11-25 16:16:39 +08:00
jiaoyangna a248330241 Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	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/ArenaInfoProto_pb.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/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
2021-11-25 16:10:14 +08:00
gaoxin 458b7b2ca5 【灵兽】升级时,没有战斗力变化提示 2021-11-25 16:03:41 +08:00
ZhangBiao 2d76df2105 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:59:42 +08:00
ZhangBiao 8da0a81588 【寻仙抽】提交 2021-11-25 15:59:31 +08:00
gaoxin 879cf506f5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:43:15 +08:00
gaoxin 4923314bbb 【战斗】屏幕震动加入伤害延时时间 2021-11-25 15:43:10 +08:00
wangzhenxing aff13f8904 【战斗】======技能132-140提交 2021-11-25 15:07:40 +08:00
wangzhenxing b15eaf8b19 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:05:10 +08:00
wangzhenxing ae8021cd6a [战斗表现]========敌我方立绘镜像显示 2021-11-25 15:04:55 +08:00
gaoxin b316f54e50 【战斗】护盾特效层级问题优化 2021-11-25 14:46:46 +08:00
gaoxin 336321ebf3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 14:44:15 +08:00
gaoxin a36714d286 【战斗】跳过提示文字:第二回合结束后可以跳过 2021-11-25 14:44:10 +08:00
ZhangBiao 1c9d113a86 【活动、修为】界面调整 2021-11-25 11:52:35 +08:00
ZhangBiao 3ffefeea3c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 11:03:17 +08:00
ZhangBiao 855f658a93 【灵兽宝阁】错误修改 2021-11-25 11:03:08 +08:00
gaoxin 347cc3f9ba 【每日豪礼】资源68->98 2021-11-25 10:47:02 +08:00
ZhangBiao e4b0fd1824 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 18:14:37 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
gaoxin 4607bd2fed Merge branch '0功能/账号id校验' into china/dev 2021-11-24 16:03:34 +08:00
gaoxin bb15f0056e 【战斗】弹道特效不在根据贝塞尔曲线运动 2021-11-24 14:42:11 +08:00
gaoxin d1ce54c9a9 【测试战斗】报错修复 2021-11-24 14:22:27 +08:00
gaoxin f01889db21 【战斗】改为第三回合时战斗就可以跳过 2021-11-24 14:21:44 +08:00
gaoxin 86dff44ce7 【主界面按钮】兼容删除了的活动 2021-11-24 11:43:46 +08:00
ZhangBiao 2d25ebb61b 【修为】修为调整 2021-11-24 11:30:55 +08:00
ZhangBiao 0e15c3d812 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 10:22:51 +08:00
ZhangBiao 18648a7622 【云游商人】装备文字叠加、显示人名错误修改 2021-11-24 10:18:36 +08:00
jiaoyangna 012847047e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 07:28:50 +08:00
jiaoyangna e947ab68b2 排行奖励切换奖励显示不正确修改 2021-11-24 07:24:17 +08:00
gaoxin 5462a1ad3b 【战斗】弹道特效转向 2021-11-23 17:23:35 +08:00
gaoxin 3f343bb1b2 【战斗】关卡和每日副本战斗改为3回合后跳过,其他战斗直接可以跳过 2021-11-23 17:22:54 +08:00
wangzhenxing 9cce1aa31c 【战斗表现】======剧情特殊处理敌人名字位置 2021-11-23 15:13:43 +08:00
jiaoyangna 86bf793ba7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-23 14:01:00 +08:00
jiaoyangna 735b2dc404 法宝之灵展示修改 2021-11-23 14:00:36 +08:00
wangzhenxing b8b1c74f03 [战斗]========被动391修改 我方流血显示修改 2021-11-23 10:46:52 +08:00
jiaoyangna e88f1f7b01 【ID1019276】
【法宝聚灵】改排版后,返回按钮遮挡技能描述
2021-11-23 10:31:09 +08:00
ZhangBiao 6cd26e96af 【灵脉秘境】纪录换行问题修改 2021-11-22 19:11:07 +08:00
ZhangBiao fbb58dbfdc 【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名 2021-11-22 18:44:32 +08:00
ZhangBiao bdc85fea41 【灵脉秘境】红点修改 2021-11-22 18:08:48 +08:00
ZhangBiao ba1201dd7a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:59:55 +08:00
ZhangBiao d06d3c6e2f 【灵脉秘境】红点判断 2021-11-22 17:59:46 +08:00
gaoxin 95382d530e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:37:38 +08:00
gaoxin 487c0d327a 【魂印穿戴】点击穿戴其他神将身上的魂印提示穿戴成功,但不显示,需要来回切换才能刷新并且看到新替换的魂印 2021-11-22 17:37:26 +08:00
wangzhenxing d9120676f7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:22:50 +08:00
wangzhenxing 134b1aff71 【战斗表现】============我方复活后血条不显示修改 2021-11-22 17:21:59 +08:00
ZhangBiao 232e965dbc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:20:12 +08:00
ZhangBiao f4febd8ed8 【灵脉秘境】竞技场pvp切磋报错修改 2021-11-22 17:20:04 +08:00
wangzhenxing f67006e041 【战斗】============战斗超时pvp类型检测添加类型 2021-11-22 16:57:46 +08:00
ZhangBiao 9fe1e610ca Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:52:29 +08:00
ZhangBiao d688ae8ab9 【灵脉秘境】排行错误提交 2021-11-22 16:52:21 +08:00
gaoxin 66670029dc 【战斗】修复战斗跳过时,人物回收,但是延时方法依然会执行的问题 2021-11-22 16:42:14 +08:00
jiaoyangna 21fa0c1762 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:38:43 +08:00
jiaoyangna 083d33b237 【ID1019215】
【坐骑合成】坐骑合成时拖动进度条可以把当前合成数量变成0,点击加号提示神将已达上限
2021-11-22 16:38:24 +08:00
wangzhenxing 3ec9fd80fd [战斗]======被动360 伤害公式修改只有神将才计算阵营伤害增减 2021-11-22 16:34:57 +08:00
gaoxin 7f68c39f91 【灵脉】回放跳过时战斗卡住 2021-11-22 16:28:36 +08:00
gaoxin f81914dfaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:13:30 +08:00
gaoxin d52ca13ff6 【战斗】关闭战斗类型打印 2021-11-22 16:13:06 +08:00
ZhangBiao 425d4934b8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:11:29 +08:00
ZhangBiao ab4faba301 【灵脉秘境】主动攻击不会产生红点 2021-11-22 16:11:21 +08:00
gaoxin e800f29b33 【竞技场】查看玩家信息报错 2021-11-22 16:06:52 +08:00
jiaoyangna 7722ede726 属性修改提交 2021-11-22 15:55:02 +08:00
jiaoyangna 5e8f8c59a1 添加底图 2021-11-22 15:48:54 +08:00
jiaoyangna ed5cd6ec59 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 15:25:53 +08:00
jiaoyangna 9d2023c182 法宝之灵提交 2021-11-22 15:25:26 +08:00