Commit Graph

2916 Commits (be9b79897ea47bed815ecc014bdc508eaa429b27)
 

Author SHA1 Message Date
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