Commit Graph

5086 Commits (4950e48b2f18014602f79e9b20bb8de20497bc95)

Author SHA1 Message Date
wangzhenxing 520e5de224 天尊降世预设修改 2021-04-27 22:48:02 +08:00
wangzhenxing c3ee3da9dd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:42:19 +08:00
wangzhenxing 137196f197 天尊降世预设提交 2021-04-27 22:41:56 +08:00
gaoxin bc441f50e3 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:40:30 +08:00
gaoxin 059535bbc0 【资源】新增法宝资源,玄黄之气资源替换,玉帝技能文字替换 2021-04-27 22:40:20 +08:00
wangzhenxing 0dc8f94264 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:35:15 +08:00
wangzhenxing 0a6be18474 成长礼包banner替换回之前的 2021-04-27 22:34:18 +08:00
gaoxin 79b73da602 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:31:35 +08:00
gaoxin fb2139ffef 【踏碎凌霄】战斗中掉落的宝箱特效,会在结算界面穿透 2021-04-27 22:30:17 +08:00
jiaoyangna b2cd860042 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:28:59 +08:00
jiaoyangna fb90162ae8 预设提交
(cherry picked from commit 941d3856a2)
2021-04-27 22:28:49 +08:00
jiaoyangna 941d3856a2 预设提交 2021-04-27 22:28:30 +08:00
ZhangBiao dc03b46855 【踏碎凌霄】活动界面提交 2021-04-27 22:26:36 +08:00
jiaoyangna 88f9e83e1c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:25:16 +08:00
jiaoyangna 58e6a0a554 剧情提交
(cherry picked from commit f43cd38a73)
2021-04-27 22:21:46 +08:00
jiaoyangna f43cd38a73 剧情提交 2021-04-27 22:21:14 +08:00
wangzhenxing d2a7fdcee1 天尊降世活动资源提交 2021-04-27 22:16:42 +08:00
ZhangBiao dfb0a68f2c 【踏碎凌霄】资源提交 2021-04-27 21:45:04 +08:00
ZhangBiao 5401776a8d 【踏碎凌霄】界面显示调整 2021-04-27 21:28:48 +08:00
ZhangBiao 4e0b5a9033 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 21:17:51 +08:00
ZhangBiao 8e72485e7b 【累计充值】资源替换 2021-04-27 21:17:42 +08:00
zhangqiang 85136a4cc9 【逍遥游】奖励预览,跳转出去,再返回,奖池不显示道具 2021-04-27 21:17:35 +08:00
zhangqiang 8db10cf7eb 【神衣天降】购买次数显示修改 2021-04-27 21:09:29 +08:00
gaoxin 2be2ba92dd 【七天狂欢】偶现报错 2021-04-27 20:56:09 +08:00
gaoxin 9b4ce2d96a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:53:42 +08:00
gaoxin 3616fba4fb 【副本banner】还原 2021-04-27 20:53:32 +08:00
zhangqiang a46c7f3413 【恭喜获得修改】 2021-04-27 20:48:45 +08:00
jiaoyangna b52e90c96a Merge branch 'china/dev' into china/dev-c 2021-04-27 20:46:12 +08:00
jiaoyangna dd90a200c3 剧情提交 2021-04-27 20:45:03 +08:00
gaoxin 3640a17c22 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:44:56 +08:00
gaoxin 6d38527065 【云游商人】排序错误 2021-04-27 20:44:45 +08:00
ZhangBiao 407750afd5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:35:37 +08:00
ZhangBiao 833473f334 【踏碎凌霄】恭喜获得无奖励提示 2021-04-27 20:35:27 +08:00
gaoxin 923034957e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:26:15 +08:00
gaoxin 1e7142008c 【云游商人】选中武器点确定,再选中护甲点取消,最后合成的是护甲 2021-04-27 20:26:10 +08:00
jiaoyangna fd9084da86 关掉挂机打怪的声音 2021-04-27 20:18:26 +08:00
ZhangBiao b695224100 【商店刷新】商店刷新时间错误 2021-04-27 20:18:18 +08:00
ZhangBiao a69e92bc75 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:03:48 +08:00
ZhangBiao c24e7504cb 【恭喜获得】点击面板也可关闭 2021-04-27 20:03:37 +08:00
jiaoyangna ccaab65e25 剧情提交 2021-04-27 19:51:40 +08:00
gaoxin a5b8dc1de9 【Log】删除一个停不下来的Log 2021-04-27 18:16:46 +08:00
gaoxin 8be0dd71f0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 18:02:56 +08:00
gaoxin 68626e287e 【踏碎凌霄】奖励排序 2021-04-27 18:02:51 +08:00
zhangqiang f20c58dc96 【公会援助】 每次点击援助,列表都会重新置顶显示----3 2021-04-27 17:56:55 +08:00
zhangqiang 4cbb65c73b 【超值基金】买两次 尝试修复 2021-04-27 17:53:15 +08:00
ZhangBiao 90fd541e99 【限时活动】删除timer 2021-04-27 17:50:26 +08:00
ZhangBiao 39f2f06563 【限时活动】调整 2021-04-27 17:05:53 +08:00
wangzhenxing 5937fc3493 等级推送礼包预设修改 2021-04-27 16:51:58 +08:00
ZhangBiao c88bda25c7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:46:50 +08:00
ZhangBiao 6f17dbd874 【恭喜获得】报错 2021-04-27 16:46:39 +08:00
gaoxin b9f742fcf2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:46:13 +08:00
gaoxin 3775b6ae86 【网络】消息id打印位置修改 2021-04-27 16:46:02 +08:00
ZhangBiao 6b26846677 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:37:17 +08:00
ZhangBiao 87b94c283a 【恭喜获得】奖励叠加 2021-04-27 16:37:03 +08:00
wangzhenxing 2d87367728 副本入口图片位置修改提交 2021-04-27 16:31:32 +08:00
gaoxin 2a107e99cb 【红点】关闭一些重复注册的红点 2021-04-27 16:30:08 +08:00
gaoxin dc12373d06 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:25:19 +08:00
gaoxin 67ddcedfa2 【网络】socket 报错 2021-04-27 16:25:09 +08:00
zhangqiang 9f69ba9d7c 【新的协议】 2021-04-27 16:23:25 +08:00
jiaoyangna f658dcaf66 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:19:31 +08:00
jiaoyangna 5b9b72fea5 资源提交
(cherry picked from commit 059c9940cc)
2021-04-27 16:19:20 +08:00
gaoxin ef856fd534 【网络】当后端推送未注册的indication时,进行错误提示 2021-04-27 16:17:58 +08:00
jiaoyangna 059c9940cc 资源提交 2021-04-27 16:16:41 +08:00
gaoxin 87f3f6da6c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:00:34 +08:00
gaoxin fe6a38cbad 【轩辕宝境】进入界面时,当前不开放的宝境入口也会亮起1S左右 2021-04-27 16:00:24 +08:00
wangzhenxing 06e61b64e8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 15:50:59 +08:00
wangzhenxing f088d4d81b 预设修改 boss怒气添加特效 2021-04-27 15:50:23 +08:00
gaoxin 16268410b7 【拍脸】部分界面销毁后导致报错 2021-04-27 15:49:56 +08:00
gaoxin b1e3b753e4 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 15:45:53 +08:00
gaoxin 7cbec8230a 【跳转】跳转充值,点返回没反应,再点直接返回主城 2021-04-27 15:45:49 +08:00
ZhangBiao eb81667c29 【碎片合成】 2021-04-27 15:28:18 +08:00
ZhangBiao 3512d1da7e 【开服累计充值】没有倒计时 2021-04-27 15:16:21 +08:00
gaoxin d610d44c0f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 14:42:23 +08:00
gaoxin 5254edb78f 【UI配置】多余删除还原 2021-04-27 14:42:13 +08:00
ZhangBiao b18596b8b0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 14:34:59 +08:00
ZhangBiao d1a1d922c1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-04-27 14:34:52 +08:00
zhangqiang b000e84564 【超值基金】判断是否可购买 修改 2 2021-04-27 14:34:29 +08:00
ZhangBiao 014623000f 表数据 2021-04-27 14:34:06 +08:00
ZhangBiao df76a49401 【碎片自选箱】通过道具详情跳转别的地方,返回后选中标识居中 2021-04-27 14:33:25 +08:00
gaoxin c73f7b4fbc 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
gaoxin 555d046748 Merge branch 'china/dev' into china/dev-c 2021-04-27 14:16:46 +08:00
gaoxin b09a71eed4 【战斗】多余显示关闭 2021-04-27 14:16:20 +08:00
jiaoyangna c3ee907f50 Merge branch '剧情' into china/dev 2021-04-27 14:12:11 +08:00
jiaoyangna 1537410e05 剧情提交 2021-04-27 14:06:04 +08:00
ZhangBiao eb7d89578a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 13:48:29 +08:00
ZhangBiao 74b2ef62ca 【恭喜获得】提交 2021-04-27 13:48:17 +08:00
gaoxin 721eadfa98 【踏碎凌霄】修复怒气显示大小错误 2021-04-27 13:44:03 +08:00
gaoxin 533885679c 【踏碎凌霄】boss放大添加 2021-04-27 13:32:41 +08:00
gaoxin 854c11affc Merge remote-tracking branch 'origin/china/dev-c' into china/dev 2021-04-26 20:49:43 +08:00
ZhangBiao cf1cf818e2 【战斗界面】上方血条移仓 2021-04-26 20:45:42 +08:00
ZhangBiao 171da338df Revert "【战斗界面】上方血条问题修改"
This reverts commit 46d492529f.
2021-04-26 20:44:08 +08:00
ZhangBiao 91a569d918 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-26 20:42:58 +08:00
ZhangBiao 46d492529f 【战斗界面】上方血条问题修改 2021-04-26 20:42:49 +08:00
zhangqiang 3d1857dfcd 【前端拍脸修改】提交——2 2021-04-26 20:35:54 +08:00
zhangqiang 460ec366cb 【礼包】去掉LevelLinit 字段判断 2021-04-26 20:27:29 +08:00
zhangqiang ca9594fefc 【超值基金】是否可购买判断修改 2021-04-26 20:08:32 +08:00
gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-04-26 19:03:05 +08:00
jiaoyangna 8b8d0a3956 剧情 提交 2021-04-26 18:57:54 +08:00
ZhangBiao 24937470ad Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-26 18:46:27 +08:00
ZhangBiao 90fbe78773 【积天豪礼】提交 2021-04-26 18:46:19 +08:00
jiaoyangna 637aa36041 剧情提交 2021-04-26 18:29:47 +08:00
gaoxin 7df1514da8 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
2021-04-26 17:55:43 +08:00
ZhangBiao 2770e6da31 Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-04-26 17:18:02 +08:00
ZhangBiao 73588be932 【踏碎凌霄】 2021-04-26 17:12:39 +08:00
ZhangBiao 8269afe74d 【踏碎凌霄】回访 2021-04-26 16:53:36 +08:00
ZhangBiao 98f12190ea 【踏碎凌霄】 2021-04-26 16:46:03 +08:00
ZhangBiao 31b9eb3057 【踏碎凌霄】 2021-04-26 16:20:22 +08:00
wangzhenxing 62112ecff0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-26 15:45:43 +08:00
wangzhenxing ebde6e43b0 [功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能 2021-04-26 15:45:30 +08:00
zhangqiang cccc067c41 【特权商城光效】跳转至特权商城后,对应特权上的光效消失 2021-04-26 15:19:56 +08:00
zhangqiang 154e048796 【十五日登陆】无可领取奖励时,入口消失 2021-04-26 15:19:11 +08:00
zhangqiang b4ed183fc6 【前端拍脸修改】提交——1 2021-04-26 13:44:31 +08:00
zhangqiang 26e63d7c9e 【月卡】累冲金额调整 2021-04-26 12:11:02 +08:00
wangzhenxing bbbf5598d6 立绘图片资源替换 2021-04-26 11:11:46 +08:00
jiaoyangna f38e838967 特权商城跳转到对应礼包位置 2021-04-26 10:38:57 +08:00
ZhangBiao b0d0fab6d5 【踏碎凌霄】提交 2021-04-26 10:23:19 +08:00
wangzhenxing 7a5d44a8f2 【战斗】============被动313修改 2021-04-26 10:00:11 +08:00
jiaoyangna 15ef116032 剧情提交 2021-04-26 09:41:41 +08:00
gaoxin e25750d948 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-25 21:30:31 +08:00
gaoxin 2a4b70f212 【回放】修复战斗回放时报错 2021-04-25 21:30:25 +08:00
wangzhenxing 324c93e93f 【战斗】==============被动313修改 2021-04-25 19:50:54 +08:00
gaoxin 9874f5b42a 【新人商城】法宝直升25级提示添加 2021-04-25 19:26:58 +08:00
gaoxin 4ebd3d79f6 【限时神装】文字资源提花 2021-04-25 17:41:48 +08:00
ZhangBiao 072b7713c2 【恭喜获得】界面结构调整 2021-04-25 17:40:49 +08:00
gaoxin f9df42a165 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-25 17:01:43 +08:00
gaoxin 0adf5574ed 【活动】快速切换页签时会出现报错 2021-04-25 17:01:32 +08:00
zhangqiang fbd3bc91ee 【公会援助】每次点击援助,列表都会重新置顶显示——2 2021-04-25 16:54:03 +08:00
gaoxin 23e5b50dc4 【活动】修复极速达人打开界面报错 2021-04-25 16:52:11 +08:00
gaoxin ae913805c5 【挂机】界面关闭后,携程中添加空判断防止报错 2021-04-25 16:49:39 +08:00
gaoxin 229b7165ee 【挂机】第五账地图偶现死循环卡死 2021-04-25 16:49:08 +08:00
gaoxin d48b6fc988 【对象池】偶现回收出现空物体,导致报错的问题 2021-04-25 16:48:41 +08:00
gaoxin 77955d6f9c 【挂机】修复金钱流光在宝箱上不消失 2021-04-25 16:11:00 +08:00
gaoxin 1c69c62ab7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-25 16:05:16 +08:00
gaoxin 4a33407d27 【挂机】修复部分章节卡死 2021-04-25 16:05:11 +08:00
wangzhenxing efa66c0130 【战斗】=========被动313 修改 2021-04-25 15:53:24 +08:00
wangzhenxing 26d50be57c 【战斗】================增加313被动 2021-04-25 15:46:08 +08:00
zhangqiang 959a40bca9 【头像】初始头像消失 2021-04-25 15:27:44 +08:00
ZhangBiao 39329ce5cc 【踏碎凌霄提交】 2021-04-25 15:07:36 +08:00
zhangqiang b113f5c221 【送神祠】放生灵兽,选择单只灵兽,碎片会出现黑色图片 2021-04-25 14:57:45 +08:00
wangzhenxing 63caca8a31 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-25 14:27:00 +08:00
wangzhenxing 8bece9b87b 副本入口立绘位置修改 2021-04-25 14:25:40 +08:00
zhangqiang 2b595bb8f5 【跳转】化虚坛跳转修改2 2021-04-25 14:20:07 +08:00
zhangqiang 438bfea81a 【跳转】修改化虚坛跳转 2021-04-25 14:02:27 +08:00
gaoxin 89f201d8f9 【引导战斗】添加跳过功能 2021-04-25 11:41:15 +08:00
gaoxin 379de4fed0 【活动】每日礼包不再在界面中刷新数据,会导致死循环 2021-04-25 11:14:14 +08:00
ZhangBiao 6a0a230eb6 【踏碎凌霄】 2021-04-23 19:37:15 +08:00
wangzhenxing 1631e8d464 【ID1008820】
【车迟斗法】红点提示优化
2021-04-23 18:13:59 +08:00
ZhangBiao 1f9c73e6ed 【踏碎凌霄】 2021-04-23 17:59:56 +08:00
ZhangBiao 325421e04c 【踏碎凌霄】提交 2021-04-23 17:56:57 +08:00
wangzhenxing 278282f73e [图片]==============替换立绘图片资源 2021-04-23 17:45:39 +08:00