Commit Graph

7801 Commits (c688666e99f54250e8c62178582b932b352e155f)
 

Author SHA1 Message Date
jiaoyangna 10e4552c4f Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-06-28 10:31:22 +08:00
gaoxin 8085adfe25 【工具】同步战斗校验服,添加未进版本的文件 2021-06-28 10:27:08 +08:00
gaoxin da16945d78 【工具】同步战斗校验服代码添加,提交需svn命令行工具
https://www.visualsvn.com/files/Apache-Subversion-1.14.1.zip
2021-06-26 19:52:08 +08:00
JieLing da2bf20585 Merge branch 'china/local' into china/test 2021-06-26 19:15:40 +08:00
JieLing 0b9c21f61f Merge branch 'china/dev' into china/local 2021-06-26 18:58:06 +08:00
zhangqiang 0412d20463 【大闹天宫】一键上阵报错(原因 鸿蒙阵共鸣神将没有赋值大闹天宫血量) 2021-06-26 18:56:58 +08:00
gaoxin fbf43c9a3c 【适配】修复适配后图鉴界面不显示内容 2021-06-26 17:15:57 +08:00
wangzhenxing fda66630b9 [适配]==== 战中boss界面,图鉴主界面修改提交 2021-06-26 17:11:10 +08:00
gaoxin 23293e2ddc 【适配】图鉴角色信息界面适配优化 2021-06-26 17:07:36 +08:00
gaoxin b53554a4a8 【剧情】修复新手战斗结束时孙悟空位置显示错误 2021-06-26 17:00:20 +08:00
jiaoyangna 35523560c0 乾坤宝盒 提交 2021-06-26 15:28:47 +08:00
jiaoyangna 0423ac27de 乾坤宝盒修改提交 2021-06-26 15:28:41 +08:00
gaoxin d89d4427c1 【背景适配】优化宽屏下背景显示错误 2021-06-26 15:16:50 +08:00
gaoxin 2d8d632436 【登录】修复服务器列表界面,推荐服tips错误显示已有角色的问题 2021-06-26 15:16:23 +08:00
jiaoyangna 83f549cc6d 首充滑动修改 2021-06-26 15:16:08 +08:00
jiaoyangna 19c4cc832e 首充修改提交 2021-06-26 15:16:02 +08:00
jiaoyangna 040fd77db0 首充修改 2021-06-26 15:15:43 +08:00
jiaoyangna 7542d5e607 首充修改提交 2021-06-26 15:15:27 +08:00
jiaoyangna de4bcd80b5 ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-26 15:15:19 +08:00
gaoxin 183a5a188b 【音效】金吒技能音效上传 2021-06-26 15:11:23 +08:00
gaoxin e901b74981 【资源】所向披靡banner资源替换 2021-06-26 15:09:23 +08:00
ZhangBiao 4e2463723a 【灵兽】特效添加 2021-06-26 14:50:52 +08:00
wangzhenxing 129768154c [bug]============【心愿抽卡】道具不足时抽卡,显示特效 2021-06-26 14:04:45 +08:00
zhangqiang 8bc03131ee 【太初行渠道quick】场景提交 2021-06-26 13:52:28 +08:00
wangzhenxing a02de7de2f [战斗]============战斗效果显示文字图片提交 2021-06-26 13:23:09 +08:00
jiaoyangna 68b2095547 首充滑动修改 2021-06-25 18:41:34 +08:00
jiaoyangna 0bb076913b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-25 18:28:46 +08:00
jiaoyangna b3679b70f3 首充修改提交 2021-06-25 18:28:42 +08:00
ZhangBiao 0a7d9bedc4 Revert "【灵兽山】特效资源提交"
This reverts commit aa495f7392.
2021-06-25 18:22:28 +08:00
ZhangBiao aa495f7392 【灵兽山】特效资源提交 2021-06-25 18:16:52 +08:00
gaoxin c2d3a481ff 【登录】修复服务器列表界面,推荐服tips错误显示已有角色的问题 2021-06-25 16:44:08 +08:00
gaoxin 757ec35f44 【登录】容错处理添加 2021-06-25 16:02:22 +08:00
jiaoyangna c3cf51d2fb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-25 15:44:48 +08:00
jiaoyangna a19795a39c 首充修改 2021-06-25 15:44:43 +08:00
zhangqiang c2d6f137b6 【战力不一致】我要变强界面和主城战力不一致 2021-06-25 15:35:03 +08:00
zhangqiang a87f40756d 【鸿蒙阵】将五星神将放入鸿蒙阵,期间进行升星操作,这时候把神将下阵,由等级控制的前五个天赋会被保留,重登显示正常 2021-06-25 15:14:12 +08:00
zhangqiang 6f7d6731a4 【特效】主城/挂机界面自己小人脚底添加光圈4 2021-06-25 11:52:54 +08:00
gaoxin 09cddf573e 【背景适配】优化宽屏下背景显示错误 2021-06-25 11:12:22 +08:00
gaoxin 29825dbfc3 【音效】玉皇大帝技能音效添加 2021-06-25 10:47:18 +08:00
ZhangBiao 6bf1306ba5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-24 18:13:50 +08:00
ZhangBiao 86679edd3e 【站内信】 2021-06-24 18:13:39 +08:00
zhangqiang 20ffda9ec2 【特效】主城/挂机界面自己小人脚底添加光圈3 2021-06-24 18:13:17 +08:00
ZhangBiao 9bdbc9e123 【站内信】协议增加置顶和标识 2021-06-24 18:09:53 +08:00
ZhangBiao 08ded6e512 【皮肤】战斗结算,mvp名字,战斗统计头像 2021-06-24 18:01:05 +08:00
jiaoyangna 1690b59b67 buildconfig工具优化 2021-06-24 16:22:21 +08:00
zhangqiang a1f0db3d38 【特效】主城/挂机界面自己小人脚底添加光圈2 2021-06-24 16:19:41 +08:00
zhangqiang c7f8a84c99 【特效】主城/挂机界面自己小人脚底添加光圈 2021-06-24 16:15:39 +08:00
ZhangBiao 74ef8bc129 【图标】图标大小跟其他不一致调整 2021-06-24 15:27:08 +08:00
ZhangBiao 097cf4055f 【灵兽界面优化】优化界面效果 2021-06-24 14:47:54 +08:00
ZhangBiao 81e7392ce9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-24 14:12:00 +08:00