Commit Graph

2226 Commits (3e7c24c029980974ef4aafe371c14d334ad16aca)

Author SHA1 Message Date
zhangqiang 0ca5e4ea13 【觉醒】bug 2020-11-11 20:21:37 +08:00
zhangqiang adf9c87ac2 【灵兽提交】bug修改 2020-11-11 20:21:13 +08:00
gaoxin 0887de50d5 【特效】孙悟空普通攻击受击特效材质丢失修复 2020-11-11 20:13:01 +08:00
gaoxin 740cfa0e20 【特效】孙悟空技能特效材质丢失修复 2020-11-11 20:00:12 +08:00
gaoxin 74b6294c2a 【特效】孙悟空皮肤技能特效修改 2020-11-11 19:39:55 +08:00
zhangqiang 36f8d28974 【孙悟空技能】普工特效添加 2020-11-11 18:33:06 +08:00
gaoxin 4f635cf42d 【战斗】修复特效层级显示错误 2020-11-11 18:10:06 +08:00
ZhangBiao 1ba753044f 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
gaoxin a65c528256 【GM】战斗种子数据类型错误 2020-11-11 16:10:21 +08:00
gaoxin a3d6f49e15 【gm】修复战斗数据gm报错的问题 2020-11-11 16:04:01 +08:00
zhangqiang 629eb98f1b Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-11 11:37:26 +08:00
zhangqiang 90e9e84c64 【觉醒】十一星的星级展示修改 2020-11-11 11:12:14 +08:00
zhangqiang 053de93608 【神将觉醒】 提交 2020-11-10 18:35:37 +08:00
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +08:00
ZhangBiao ebe03eff48 【易经宝库】漏题 2020-11-10 16:43:24 +08:00
ZhangBiao 1ece0c1a77 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 16:25:56 +08:00
ZhangBiao ec9458aac7 【易经宝库】抽取灵兽报错修复 2020-11-10 16:25:42 +08:00
gaoxin b8c6bf7a62 【白泽】音效修改 2020-11-10 15:46:26 +08:00
gongjiawei 0d56c34220 白泽灵兽语音修改 2020-11-10 15:28:25 +08:00
jiaoyangna 0d26c4d0ab Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 15:26:42 +08:00
jiaoyangna 2e125eaa47 新手引导修改 2020-11-10 15:26:33 +08:00
liujiaqi 21248cf571 定卦神锄资源 2020-11-10 14:56:03 +08:00
JieLing 3e24ba9bcf Revert "定卦神锄新图标上传"
This reverts commit 495ea6e24e.
2020-11-10 14:47:18 +08:00
ZhangBiao d493246f2f 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
zhangqiang 53e538ea0d 【音效】 替换 2020-11-10 11:32:30 +08:00
zhangqiang 7f5287baa2 【音效】 替换 2020-11-10 11:32:06 +08:00
jiaoyangna 05911e105c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 11:04:28 +08:00
jiaoyangna 89a90ae5c5 神医天降修改 2020-11-10 11:04:19 +08:00
gaoxin 8ef89acdde 【bug】修复部分界面文字显示错误的问题 2020-11-10 10:37:53 +08:00
gaoxin a12003191c 【音效】孙悟空技能音效添加 2020-11-10 10:26:01 +08:00
jiaoyangna 22d3761937 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 10:24:07 +08:00
jiaoyangna 3f7ae45011 皮肤修改 2020-11-10 10:23:55 +08:00
zhangqiang 6278bb0cc8 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:23 +08:00
zhangqiang 92d85c4200 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:01 +08:00
zhangqiang 6a1693939c 【觉醒】 觉醒添加图鉴 2020-11-09 20:05:51 +08:00
liujiaqi 495ea6e24e 定卦神锄新图标上传
(cherry picked from commit 89c73695e2)
2020-11-09 18:10:50 +08:00
zhangqiang 85b21b27f0 Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-09 18:04:54 +08:00
zhangqiang c4a466637f 【神将升级】 太快优化 2020-11-09 16:29:06 +08:00
ZhangBiao 46b8e52524 【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
2020-11-09 16:02:34 +08:00
wangzhenxing 4fa66650f0 [皮肤]伤害统计界面添加皮肤显示 2020-11-09 15:54:36 +08:00
ZhangBiao dca4f2511a Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-09 15:29:42 +08:00
ZhangBiao e6eb5d7673 【易经宝库】格子点击位置不准确修复 曾加tips 2020-11-09 15:28:24 +08:00
zhangqiang d6ab502c45 【逍遥游】 通关后返回问题修复 2020-11-09 15:24:38 +08:00
DESKTOP-98AVA47\Administrator 4be2045801 添加容错 --by 焦杨钠 2020-11-13 07:12:51 +08:00
zhangqiang f94c84f1cd 【觉醒】 增加觉醒页签 2020-11-09 15:04:48 +08:00
ZhangBiao c4745e8c7c 【易经宝库】最终奖励选择bug修复 2020-11-09 13:47:37 +08:00
zhangqiang de677bee2f 【觉醒】增加脚本 2020-11-09 11:13:53 +08:00
ZhangBiao d0e2133cbc Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-09 11:09:50 +08:00
ZhangBiao 9ca403ebff 【易经宝库】第三层抽取完成后bug修复 2020-11-09 11:09:42 +08:00
jiaoyangna 5d24bbb8a8 森罗环境英雄皮肤提交 2020-11-09 10:32:17 +08:00
zhangqiang 5c73587f89 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-09 10:16:16 +08:00
jiaoyangna f26214ac58 清楚红点提交 2020-11-07 17:23:10 +08:00
jiaoyangna 6cb1610d31 神医天降修改 2020-11-07 16:56:53 +08:00
jiaoyangna bc097708e9 不满足进阶条件,显示红点 2020-11-07 16:41:25 +08:00
jiaoyangna e2b29242c7 有孙悟空皮肤,东华帝君皮肤点不到获取途径 2020-11-07 15:52:20 +08:00
jiaoyangna 4cf115e655 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-07 15:45:02 +08:00
jiaoyangna f2f288c682 进阶页签属性图标显示错误 2020-11-07 15:44:53 +08:00
gaoxin c3916271aa Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-07 15:43:07 +08:00
gaoxin bd6e61d92a 【语言工具】添加代码语言还原工具 2020-11-07 15:42:11 +08:00
jiaoyangna e517e2a175 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-07 15:39:10 +08:00
jiaoyangna 04fac7f216 魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗 2020-11-07 15:39:01 +08:00
jiaoyangna 77047346dd 神医天降价格修改 2020-11-14 14:43:48 +08:00
jiaoyangna ef4c4fccba power change update 2020-11-14 14:31:38 +08:00
jiaoyangna c639ea1c6b delete log 2020-11-14 14:16:41 +08:00
jiaoyangna 069d42baca 皮肤到期刷新 2020-11-14 14:16:10 +08:00
zhangqiang b113f94a6d 【幻境达人】 排行奖励显示问题 2020-11-07 15:20:44 +08:00
zhangqiang 68979d577e 【神将觉醒】 觉醒成功界面 2020-11-07 15:15:49 +08:00
jiaoyangna 8f1c52c5e3 属性加成修改 2020-11-06 21:23:24 +08:00
jiaoyangna d4687b2b74 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 21:05:43 +08:00
jiaoyangna 3a481d6d5f [皮肤]修改提交 2020-11-06 21:05:39 +08:00
gaoxin 05fb2f5e7f 【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误 2020-11-06 20:45:44 +08:00
jiaoyangna 93d9212f85 皮肤加成属性修改 2020-11-06 20:39:00 +08:00
jiaoyangna 0a772f466b 皮肤提交 2020-11-06 20:36:38 +08:00
jiaoyangna 98ff210ae2 皮肤解锁提示 2020-11-06 20:21:20 +08:00
jiaoyangna bd92d5339d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 19:54:49 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
zhangqiang 34d67b93f6 【巅峰赛】 赛程 三局第一局结果有问题 修改 2020-11-06 18:32:48 +08:00
wangzhenxing 5128a02eba [皮肤] 胜利最佳输出界面显示皮肤 2020-11-06 17:58:28 +08:00
JieLing 7913bda03f 【资源】重名资源修改 2020-11-06 17:56:55 +08:00
gaoxin 5b0ac7cd0b 【音效】灵兽音效资源同步 2020-11-06 17:45:18 +08:00
jiaoyangna a6904526d3 协议提交 2020-11-06 17:26:58 +08:00
jiaoyangna 41f62176f2 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 17:19:34 +08:00
jiaoyangna fe9b73aa0b 协议提交 2020-11-06 17:19:24 +08:00
zhangqiang 98d4b3b024 【达人奖励排行】 显示问题修复 2020-11-06 17:18:17 +08:00
wangzhenxing 9eb5161c7e 【皮肤】东华帝君 ,孙悟空技能特效修改提交 2020-11-06 17:02:42 +08:00
zhangqiang aa2db3e25e 【大闹天宫】 节点boss 站位错误 修复 2020-11-06 16:51:44 +08:00
zhangqiang 7121be9c04 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:49:18 +08:00
zhangqiang ac64980843 【易经宝库】 特效层级调整 2020-11-06 16:49:12 +08:00
jiaoyangna 6a95033b8b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:39:45 +08:00
jiaoyangna cd99dd509b 立绘加载错误修改 2020-11-06 16:37:52 +08:00
zhangqiang 1a4349d93b 【觉醒】 界面提交 2020-11-06 16:23:02 +08:00
ZhangBiao fab6570a26 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:17:21 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
jiaoyangna ccdba2b2df Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:11:47 +08:00
jiaoyangna 5251bc4059 [神将界面修改] 2020-11-06 16:11:37 +08:00
ZhangBiao 36759d8044 【易经宝库】增加稿子动效 2020-11-06 16:06:08 +08:00
zhangqiang 44350558c5 【巅峰赛】 头像特效设置层级有问题 线上 2020-11-06 15:49:08 +08:00
yuanshuai 327584750a 【逍遥游】预设修改提交 2020-11-06 15:48:59 +08:00
gaoxin 34617d419d 【资源】新增英雄icon资源位置移动 2020-11-06 15:48:21 +08:00
ZhangBiao b98490f233 【易经宝库】差一个稿子的动效 2020-11-06 15:11:19 +08:00
gaoxin f1ca8398d3 【战斗】假战斗随机种子读表 2020-11-06 15:04:11 +08:00
wangzhenxing 4a6d8b393f 技能提交去除log 2020-11-06 15:04:05 +08:00
wangzhenxing ab4f97fa0a 皮肤修改提交 2020-11-06 15:03:56 +08:00
gaoxin c3422f1c8d 【资源】资源名重复修改 2020-11-06 15:02:46 +08:00
gaoxin 013ff84d34 【资源】孙悟空,东华帝君皮肤技能特效资源添加 2020-11-06 15:02:36 +08:00
jiaoyangna 767541c1a6 编队界面皮肤位置修改 2020-11-06 14:30:44 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
wangzhenxing 04fce03cd8 battlemanager修改提交 2020-11-06 13:32:04 +08:00
wangzhenxing 1123b38709 协议提交 2020-11-06 13:31:45 +08:00
wangzhenxing 3e917799bb 解决冲突提交 2020-11-06 13:31:30 +08:00
jiaoyangna b7b4fb9d5d meta 提交 2020-11-06 13:27:52 +08:00
gaoxin 927f2280e8 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 11:41:49 +08:00
gaoxin 857f97f2ab 【战斗】假战斗数据组建错误修复 2020-11-06 11:41:40 +08:00
liujiaqi b637d17a9b 孙悟空东华帝君皮肤资源 2020-11-06 11:21:29 +08:00
gaoxin d668e4ffc3 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
2020-11-06 11:19:46 +08:00
gaoxin 1ac0e6fc53 【战斗】添加新的假战斗功能 2020-11-06 11:18:09 +08:00
zhangqiang 3ae2d1048e 【GM】gm工具优化 2020-11-06 11:16:24 +08:00
jiaoyangna a109c2f93f 【皮肤】 战斗提交 2020-11-06 10:51:41 +08:00
jiaoyangna e8be02de87 [移山倒海] 提交 2020-11-06 10:49:08 +08:00
jiaoyangna beec28a8b8 Merge branch 'master_xma_local' into 0功能/皮肤 2020-11-06 10:34:22 +08:00
zhangqiang ea24696722 【逍遥游】新增地图 xbhz 2020-11-06 10:15:06 +08:00
jiaoyangna e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
jiaoyangna ccf02fb171 【皮肤】添加倒计时 2020-11-05 18:26:38 +08:00
jiaoyangna 5026bdd0c3 【皮肤】提交 2020-11-05 16:02:49 +08:00
jiaoyangna 3bc2b74ce5 皮肤分解提交 2020-11-05 14:18:32 +08:00
ZhangBiao 476057bd1c 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
jiaoyangna 14812dab65 [皮肤]倒计时修改 2020-11-04 18:29:49 +08:00
jiaoyangna d7b9563e35 【皮肤】神将合成修改 2020-11-04 16:56:24 +08:00
jiaoyangna 360727419e 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
jiaoyangna 6930561350 [皮肤]神将界面修改提交 2020-11-04 14:24:35 +08:00
jiaoyangna 644d984c0a 登陆报错修改 2020-11-04 14:24:08 +08:00
jiaoyangna b18b4cfd58 【皮肤】协议提交 2020-11-04 13:52:10 +08:00
jiaoyangna 79a5bcb74c 皮肤资源提交 2020-11-04 12:02:57 +08:00
jiaoyangna 4cb31d8f38 [皮肤]提交 2020-11-04 10:59:04 +08:00
jiaoyangna 509357e333 Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-04 10:54:54 +08:00
ZhangBiao 809c6daa01 【易经宝库】数据调试 2020-11-04 10:53:02 +08:00
jiaoyangna 1fcdf5b2a6 【皮肤】添加皮肤属性加成 2020-11-03 19:37:05 +08:00
zhangqiang 3ae4ed1d41 【英雄合成】 添加提示 2020-11-03 19:19:13 +08:00
ZhangBiao ab757a2543 【特权商城】最后一分钟报错修改 2020-11-03 19:10:32 +08:00
ZhangBiao d1c0d3e41f 【易经宝库】资源路径提交 2020-11-03 19:02:31 +08:00
ZhangBiao 5d40b102dc 【易经宝库】添加type 拼数据 2020-11-03 19:01:47 +08:00
gaoxin 5a861ade95 【商店】前端从表里判断商品的显示状态添加 2020-11-03 18:01:31 +08:00
ZhangBiao e7b132952c 【特权商城】报错修改 2020-11-03 17:53:14 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
gaoxin e1625e6bed 【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题 2020-11-03 17:17:46 +08:00
ZhangBiao c3537b3486 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-03 17:05:15 +08:00
ZhangBiao 81e26c3128 【特权商城】增加 灵兽特权礼包 文字描述 2020-11-03 17:04:45 +08:00
zhangqiang 0918acadd4 【灵兽系统】 羁绊预设微调 2020-11-03 16:10:45 +08:00
zhangqiang 0a8498b95e 【灵兽系统】 召唤界面按钮文字位置 2020-11-03 16:08:10 +08:00