wangzhenxing
|
bc04671ed5
|
减怒数据提交
|
2021-07-01 11:31:58 +08:00 |
JieLing
|
ee33b67211
|
【花屏】再次尝试修复花屏问题
|
2021-07-01 02:28:55 +08:00 |
JieLing
|
ab2a923477
|
【公告】修复子包打开第二次后不再显示公告
|
2021-06-30 22:19:37 +08:00 |
jiaoyangna
|
8e65171ac5
|
首充不能领取修改提交
|
2021-06-30 21:15:07 +08:00 |
jiaoyangna
|
8abe558f6c
|
关闭界面时 称号预设未关闭 错误 问题修改
|
2021-06-30 21:14:53 +08:00 |
jiaoyangna
|
a175e18946
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 20:39:23 +08:00 |
jiaoyangna
|
fbfb637231
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 20:39:20 +08:00 |
JieLing
|
d58ab83e12
|
【登录】尝试修复用户协议提示文字偶现消失的问题
|
2021-06-30 20:38:10 +08:00 |
gaoxin
|
dbf599fd32
|
【bug】尝试修复打开游戏时花瓶的问题
|
2021-06-30 20:34:00 +08:00 |
wangzhenxing
|
4aca30c5ec
|
图片字预设修改提交
|
2021-06-30 20:17:59 +08:00 |
wangzhenxing
|
d3d24a10ef
|
图片字预设修改提交
|
2021-06-30 20:15:32 +08:00 |
jiaoyangna
|
bb9b58d489
|
Merge branch '0功能/神将来源' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-06-30 19:57:49 +08:00 |
wangzhenxing
|
f50ffa0746
|
Merge branch 'china/dev' into china/dev-c-battle
|
2021-06-30 19:53:11 +08:00 |
gaoxin
|
38b1a22a2d
|
【bug】尝试修复打开游戏时花瓶的问题
|
2021-06-30 19:50:47 +08:00 |
jiaoyangna
|
bfd653a98f
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:48:05 +08:00 |
jiaoyangna
|
349404d50e
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:28:43 +08:00 |
jiaoyangna
|
2cbb0b0a59
|
添加特效
|
2021-06-30 18:46:15 +08:00 |
ZhangBiao
|
555ccd253f
|
【特惠神装】提交
|
2021-06-30 18:38:20 +08:00 |
zhangqiang
|
34fbfe02d1
|
【线上问题】十绝阵挑战次数显示负数
|
2021-06-30 18:28:51 +08:00 |
jiaoyangna
|
3fadc63852
|
商店物品添加特效
|
2021-06-30 18:12:24 +08:00 |
wangzhenxing
|
2578107be4
|
【战斗】============战斗图片字显示修改
|
2021-06-30 18:06:56 +08:00 |
wangzhenxing
|
b99c52d22c
|
【bug】========【ID1016790】
灼烧 中毒等buff 在携带者被杀死的情况不提示清除
|
2021-06-30 18:03:13 +08:00 |
wangzhenxing
|
b3650db6ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 18:01:13 +08:00 |
wangzhenxing
|
4ad64a41f2
|
[bug]==========福利红包红点修改
|
2021-06-30 18:00:52 +08:00 |
jiaoyangna
|
3c9b593dfa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 17:19:59 +08:00 |
jiaoyangna
|
3f6d1af735
|
首充不能领取修改提交
|
2021-06-30 17:19:55 +08:00 |
zhangqiang
|
dbe2b1f3ea
|
【心魔试炼】资源替换2
|
2021-06-30 16:29:37 +08:00 |
jiaoyangna
|
9d11a48f70
|
跳转返回报错修改
|
2021-06-30 16:21:37 +08:00 |
jiaoyangna
|
36cb3db3af
|
底图修改提交
|
2021-06-30 16:17:50 +08:00 |
jiaoyangna
|
a4281ed031
|
四元阵跳转修改
|
2021-06-30 16:07:37 +08:00 |
zhangqiang
|
bd27e2094b
|
【心魔试炼】资源替换
|
2021-06-30 16:03:40 +08:00 |
jiaoyangna
|
e44449391d
|
神将来源修改提交
|
2021-06-30 15:47:13 +08:00 |
gaoxin
|
dad2ee5518
|
【充值】添加第四个透传参数 平台(ANDROID或IOS)
|
2021-06-30 15:40:46 +08:00 |
JieLing
|
101c79640d
|
【公告】提审服也要显示公告
|
2021-06-30 15:36:10 +08:00 |
jiaoyangna
|
b5324c165a
|
神将来源碎皮合成修改提交
|
2021-06-30 15:27:27 +08:00 |
ZhangBiao
|
3675ec9699
|
【心愿抽卡】取消按钮入场动画
|
2021-06-30 14:41:02 +08:00 |
ZhangBiao
|
eeee396c3a
|
【特惠神装】提交
|
2021-06-30 14:39:31 +08:00 |
jiaoyangna
|
a1c397d1f3
|
无尽商店添加需刷新
|
2021-06-30 14:32:58 +08:00 |
ZhangBiao
|
cebee6a95b
|
【邮件】置顶邮件报错修改
|
2021-06-30 14:26:05 +08:00 |
jiaoyangna
|
b65e6c7bac
|
神将来源修改提交
|
2021-06-30 14:21:02 +08:00 |
jiaoyangna
|
6e0eccfde5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 14:11:00 +08:00 |
jiaoyangna
|
a556ee7e2d
|
关闭界面时 称号预设未关闭 错误 问题修改
|
2021-06-30 14:10:30 +08:00 |
ZhangBiao
|
4507a0d139
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 13:51:56 +08:00 |
ZhangBiao
|
00ad684deb
|
【心愿抽卡】QA
|
2021-06-30 13:51:47 +08:00 |
gaoxin
|
de8479ba3d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 13:46:34 +08:00 |
gaoxin
|
fdba4e7aa3
|
【充值】添加第四个透传参数 平台(ANDROID或IOS)
|
2021-06-30 13:46:28 +08:00 |
ZhangBiao
|
04d4f6a5c3
|
【特惠神装】开坑
|
2021-06-30 13:26:34 +08:00 |
ZhangBiao
|
55bdc21a99
|
【心愿抽卡】增加初始化操作
|
2021-06-30 12:01:39 +08:00 |
ZhangBiao
|
782b20fa0c
|
【心愿抽卡】初始化抽卡总次数
|
2021-06-30 11:56:23 +08:00 |
jiaoyangna
|
ed1cf199a2
|
神将来源修改
|
2021-06-30 11:50:11 +08:00 |
jiaoyangna
|
58994f5a38
|
神将来源修改
|
2021-06-30 11:42:22 +08:00 |
jiaoyangna
|
6429cba1d4
|
代码报错修改
|
2021-06-30 11:37:33 +08:00 |
jiaoyangna
|
de0b9be884
|
添加首充和至尊降世的 显示
|
2021-06-30 11:36:07 +08:00 |
ZhangBiao
|
194c610b14
|
Merge branch 'china/dev' into 0功能/心愿抽卡
|
2021-06-30 11:00:00 +08:00 |
ZhangBiao
|
83fd6716e4
|
【心愿抽卡】增加长按查看操作
|
2021-06-30 10:58:35 +08:00 |
ZhangBiao
|
7d366000be
|
【心愿抽卡】完成
|
2021-06-30 10:52:05 +08:00 |
jiaoyangna
|
de642a3572
|
去掉点击事件
|
2021-06-30 10:48:50 +08:00 |
wangzhenxing
|
aeed1703bd
|
【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交
|
2021-06-30 10:40:52 +08:00 |
ZhangBiao
|
37e854190b
|
【心愿抽卡】增加所有抽卡类型和输出
|
2021-06-30 10:36:48 +08:00 |
ZhangBiao
|
ecb43803f4
|
【心愿抽卡】提交
|
2021-06-30 10:23:57 +08:00 |
jiaoyangna
|
f834e2e17d
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-30 10:12:44 +08:00 |
JieLing
|
af5fa192b6
|
【提审切换】使用正式的参数配置
|
2021-06-30 09:53:32 +08:00 |
JieLing
|
068bf059a5
|
【用户协议】添加功能开启配置
|
2021-06-30 09:52:40 +08:00 |
JieLing
|
9a3c8508c4
|
Merge branch '0功能/用户协议' into china/quick
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-06-30 09:35:51 +08:00 |
gaoxin
|
9f69b1ba8f
|
【登录】容错处理添加
|
2021-06-30 09:20:33 +08:00 |
gaoxin
|
a7c947d8b4
|
【登录】serverversion改为从后端获取
|
2021-06-30 09:18:03 +08:00 |
JieLing
|
aae1e82a1c
|
【登录】获取服务器列表和登录时的Channel差异化处理,分开配置,用于区分相同服务器列表的不同包
|
2021-06-30 09:16:28 +08:00 |
ZhangBiao
|
fc5a91522a
|
【心愿抽卡】提交
|
2021-06-29 20:29:22 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
ZhangBiao
|
262b52c4aa
|
【心愿抽卡】代码基本完成
|
2021-06-29 18:10:15 +08:00 |
ZhangBiao
|
cc16057438
|
【心愿抽卡】接协议
|
2021-06-29 15:25:05 +08:00 |
ZhangBiao
|
69581dcaa1
|
【心愿抽卡】开坑
|
2021-06-29 11:30:26 +08:00 |
JieLing
|
d492b01b5f
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
# Conflicts:
# Assets/Editor/AutoPack.cs
|
2021-06-29 10:12:13 +08:00 |
JieLing
|
840b6beb6f
|
Merge branch 'china/local' into china/test
|
2021-06-28 19:53:43 +08:00 |
jiaoyangna
|
73eac4d9e5
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
(cherry picked from commit 1ec5cc7b05)
|
2021-06-28 19:50:44 +08:00 |
zhangqiang
|
85d9610f41
|
【神将升级】升级到等级上限没有给后端发协议
|
2021-06-28 19:37:43 +08:00 |
jiaoyangna
|
3c41e96caa
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
(cherry picked from commit 1ec5cc7b05)
|
2021-06-28 18:36:01 +08:00 |
jiaoyangna
|
1ec5cc7b05
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
|
2021-06-28 18:34:19 +08:00 |
ZhangBiao
|
64d1f4883e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-28 16:56:56 +08:00 |
ZhangBiao
|
24469e4666
|
【灵兽山】特效修改
|
2021-06-28 16:56:26 +08:00 |
gaoxin
|
1f8709f17e
|
【配置】猕猴桃硬核专服母包配置错误
|
2021-06-28 15:54:24 +08:00 |
zhangqiang
|
35508a2c8d
|
【太初行渠道quick】场景提交
|
2021-06-28 15:54:17 +08:00 |
gaoxin
|
c94eba491a
|
【配置】猕猴桃硬核专服母包配置错误
|
2021-06-28 15:53:49 +08:00 |
gaoxin
|
2b4c7bb31e
|
【配置】新增硬核渠道配置
|
2021-06-28 14:22:15 +08:00 |
gaoxin
|
84cfa3e2c9
|
【配置】添加硬核渠道,先遣打包配置,热更删除默认密码
|
2021-06-28 14:22:04 +08:00 |
gaoxin
|
3b6c4c279f
|
【打包】quick打包场景提交
|
2021-06-28 14:21:55 +08:00 |
gaoxin
|
318323e50d
|
【配置】新增硬核渠道配置
|
2021-06-28 14:12:13 +08:00 |
JieLing
|
863dabcd1e
|
Merge branch 'china/local' into china/test
|
2021-06-28 13:35:29 +08:00 |
gaoxin
|
f743b57c76
|
【GM】演算后端战斗接口添加GM地址配置
|
2021-06-28 13:34:53 +08:00 |
zhangqiang
|
946841a8fb
|
【大闹天宫】一键上阵报错2
|
2021-06-28 13:34:47 +08:00 |
JieLing
|
618c8b635f
|
Merge commit '8085adfe259dc0167b67c5786871493bd8ce9a1d' into china/local
|
2021-06-28 13:34:31 +08:00 |
gaoxin
|
e46c1eb833
|
【GM】演算后端战斗接口添加GM地址配置
|
2021-06-28 11:50:10 +08:00 |
zhangqiang
|
57060f5bee
|
【大闹天宫】一键上阵报错2
|
2021-06-28 11:27:50 +08:00 |
ZhangBiao
|
fd6a518f7d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-28 10:44:27 +08:00 |
ZhangBiao
|
65887aa135
|
【站内信】提交
|
2021-06-28 10:44:15 +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 |
ZhangBiao
|
18d4289e39
|
【锻器阁】合成装备超框
|
2021-06-24 14:11:51 +08:00 |
jiaoyangna
|
6b70f85740
|
Merge branch 'china/dev' into china/dev-c
|
2021-06-24 14:05:01 +08:00 |
gaoxin
|
de0701ee03
|
【配置】添加硬核渠道,先遣打包配置,热更删除默认密码
|
2021-06-24 13:55:43 +08:00 |
gaoxin
|
7d39fe6c8a
|
【打包】quick打包场景提交
|
2021-06-24 13:55:36 +08:00 |
gaoxin
|
9d0c42f0ca
|
【配置】添加硬核渠道,先遣打包配置,热更删除默认密码
|
2021-06-24 13:54:48 +08:00 |
gaoxin
|
5cf66021e2
|
【打包】quick打包场景提交
|
2021-06-24 13:47:44 +08:00 |
ZhangBiao
|
c89826edc5
|
【用户协议】提交
|
2021-06-24 11:56:09 +08:00 |
ZhangBiao
|
6c5d6a4be4
|
【用户隐私协议】提交
|
2021-06-24 11:38:43 +08:00 |
jiaoyangna
|
748f9be757
|
首充修改提交
|
2021-06-24 11:12:34 +08:00 |
jiaoyangna
|
527a35b2c0
|
【青龙秘宝】缩小奖励间隔,当奖励大于4个时,能显示第五个奖励的部分内容
|
2021-06-24 10:24:48 +08:00 |
ZhangBiao
|
57426134aa
|
【Android】登录界面调整
|
2021-06-24 09:50:55 +08:00 |
JieLing
|
7783e0723e
|
【Android】打开网页功能
|
2021-06-23 19:39:46 +08:00 |
jiaoyangna
|
f7d97ef4aa
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-23 18:51:43 +08:00 |
jiaoyangna
|
234f3cb48f
|
ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动
(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
|
2021-06-23 18:51:35 +08:00 |
zhangqiang
|
8cdb8123e3
|
【美术 -特权优化】快捷任务底框换一个更明显的,突出文字
|
2021-06-23 18:08:54 +08:00 |
gaoxin
|
b0857d0c22
|
【音效】金吒技能音效上传
|
2021-06-23 17:26:06 +08:00 |
jiaoyangna
|
08588974a9
|
心愿抽卡单抽动画修改
|
2021-06-23 16:43:41 +08:00 |
wangzhenxing
|
5e8bab74af
|
[战斗]==========被动26, 327 107, 331 修改提交
|
2021-06-23 16:28:57 +08:00 |
jiaoyangna
|
622ea5c6a2
|
乾坤宝盒 提交
|
2021-06-23 16:13:26 +08:00 |
jiaoyangna
|
4abdfba82a
|
乾坤宝盒修改提交
|
2021-06-23 16:11:30 +08:00 |
jiaoyangna
|
7f7a534a2f
|
主题活动修改提交
(cherry picked from commit e7352701e7)
|
2021-06-23 15:12:42 +08:00 |
jiaoyangna
|
fef55ac7ad
|
假人骑牛修改
(cherry picked from commit 1c89a4218c)
|
2021-06-23 15:12:36 +08:00 |
jiaoyangna
|
84cda5fdaf
|
随机人物修改提交
(cherry picked from commit e5a491b7b9)
|
2021-06-23 15:12:28 +08:00 |
jiaoyangna
|
e7352701e7
|
主题活动修改提交
|
2021-06-23 15:11:32 +08:00 |
gaoxin
|
70f660d158
|
【资源】所向披靡banner资源替换
|
2021-06-23 13:58:48 +08:00 |
jiaoyangna
|
1c89a4218c
|
假人骑牛修改
|
2021-06-23 11:05:53 +08:00 |
jiaoyangna
|
e5a491b7b9
|
随机人物修改提交
|
2021-06-23 10:20:03 +08:00 |
gaoxin
|
c60fe0c7c6
|
【资源】修复玉帝皮肤技能显示错误
|
2021-06-22 20:58:52 +08:00 |
jiaoyangna
|
8b3e5dbae4
|
config build 提交
|
2021-06-22 20:41:51 +08:00 |
jiaoyangna
|
97da91abc3
|
buildconfig 修改提交
|
2021-06-22 20:37:34 +08:00 |
JieLing
|
75b77403be
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
|
2021-06-22 17:53:05 +08:00 |
JieLing
|
574341ed13
|
Merge branch 'china/local' into china/test
|
2021-06-22 17:52:36 +08:00 |
gaoxin
|
c0a561e75e
|
【公告】修改公告在分子包时配置的字段
|
2021-06-22 17:52:01 +08:00 |
gaoxin
|
abbdbfe3e4
|
【称号】修复老包中称号报错
|
2021-06-22 17:51:55 +08:00 |
gaoxin
|
24c2de4c6d
|
【公告】修改公告在分子包时配置的字段
|
2021-06-22 17:51:14 +08:00 |
gaoxin
|
efca8d1244
|
【称号】修复老包中称号报错
|
2021-06-22 17:42:18 +08:00 |
gaoxin
|
aec9b12ab2
|
【资源】玉皇大帝技能显示错误修复
|
2021-06-22 17:40:41 +08:00 |
gaoxin
|
db2143bfac
|
【资源】玉皇大帝皮肤技能特效资源优化
|
2021-06-22 16:38:26 +08:00 |
gaoxin
|
2d5667f9ec
|
【登录】serverversion改为从后端获取
|
2021-06-22 15:01:02 +08:00 |
JieLing
|
f1f4d1b613
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
|
2021-06-22 11:13:14 +08:00 |
JieLing
|
2154e0add4
|
【配置】专服都是从包版本1开始
|
2021-06-22 11:13:01 +08:00 |
JieLing
|
6370bc7c3b
|
Merge branch 'china/local' into china/test
|
2021-06-22 11:08:58 +08:00 |
gaoxin
|
8ec017d56f
|
【资源】草花背景资源还原
|
2021-06-22 11:08:35 +08:00 |
jiaoyangna
|
9163e4e517
|
大圣购买修改
|
2021-06-22 11:08:04 +08:00 |
gaoxin
|
4bde4b31ad
|
【资源】新增无尽副本地图资源
|
2021-06-22 11:00:37 +08:00 |
jiaoyangna
|
274f315d2b
|
大圣购买修改
|
2021-06-22 10:08:42 +08:00 |
gaoxin
|
0e451e8ea0
|
【资源】玉皇大帝皮肤资源
|
2021-06-21 20:24:32 +08:00 |
gaoxin
|
d04d0bbefb
|
【资源】玉皇大帝皮肤特效资源上传
|
2021-06-21 19:54:12 +08:00 |
jiaoyangna
|
cb37edbba0
|
秘宝间隔调整
|
2021-06-21 18:26:31 +08:00 |
ZhangBiao
|
252aff3423
|
【月卡激活】如果购买的礼包不弹恭喜获得,就不会提示已激活月卡,待下次任意界面弹恭喜获得才会提示
|
2021-06-21 17:37:34 +08:00 |
ZhangBiao
|
0dc5976dd0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-21 16:57:31 +08:00 |
ZhangBiao
|
fe16795d8c
|
【主城】右上伸缩条闪烁修改
|
2021-06-21 16:57:22 +08:00 |
gaoxin
|
e888e3987e
|
【资源】草花背景资源还原
|
2021-06-21 16:32:03 +08:00 |
gaoxin
|
f2d8eec607
|
【资源】玉皇大帝皮肤资源优化
|
2021-06-21 16:27:15 +08:00 |
wangzhenxing
|
d943d3044b
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-06-21 15:29:16 +08:00 |
gaoxin
|
01e033ad00
|
【资源】玉皇大帝皮肤资源
|
2021-06-21 15:14:02 +08:00 |