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 |
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
|
65887aa135
|
【站内信】提交
|
2021-06-28 10:44:15 +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
|
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 |
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
|
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 |
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
|
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 |
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 |
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 |
JieLing
|
05f9f121d1
|
Merge branch 'china/local' into china/test
|
2021-06-21 14:14:19 +08:00 |
JieLing
|
ca982b566c
|
Merge branch 'china/dev' into china/local
|
2021-06-21 14:13:11 +08:00 |
gaoxin
|
3f320f1e89
|
【降妖夺宝】修复协程导致报错
|
2021-06-21 14:12:33 +08:00 |
zhangqiang
|
057e32fe52
|
【福星高照】领取完所有奖励后,按钮红点不消失
|
2021-06-21 13:52:41 +08:00 |
ZhangBiao
|
ba5bc832d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 11:45:13 +08:00 |
ZhangBiao
|
4fdbc4a559
|
【降妖夺宝】抽卡跳转修改
|
2021-06-21 11:45:03 +08:00 |
jiaoyangna
|
77dea82a94
|
【ID1016745】
【升级豪礼】新到的图片资源,需要替换
|
2021-06-21 11:42:19 +08:00 |
jiaoyangna
|
0014224024
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 11:30:50 +08:00 |
jiaoyangna
|
daba103fdb
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 11:06:23 +08:00 |
jiaoyangna
|
be75375dd6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:53:42 +08:00 |
jiaoyangna
|
0f309447c2
|
【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
|
2021-06-21 10:53:24 +08:00 |
ZhangBiao
|
cf38744969
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:52:04 +08:00 |
ZhangBiao
|
428df0c41d
|
【降妖夺宝】限时商市道具光效穿透
|
2021-06-21 10:51:55 +08:00 |
zhangqiang
|
8152d96e1e
|
【福星高照】领取完所有奖励后,按钮红点不消失
|
2021-06-21 10:42:27 +08:00 |
jiaoyangna
|
e5ff298534
|
Revert "【ID1016740】"
This reverts commit 343b92aff9.
|
2021-06-21 10:38:09 +08:00 |
jiaoyangna
|
343b92aff9
|
【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
|
2021-06-21 10:36:33 +08:00 |
jiaoyangna
|
3feebf1ef6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:22:25 +08:00 |
jiaoyangna
|
c2f6c54063
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 10:22:21 +08:00 |
ZhangBiao
|
65794931b3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 09:51:52 +08:00 |
ZhangBiao
|
8c0980e750
|
【降妖夺宝】十连上方资源显示修改
|
2021-06-21 09:51:44 +08:00 |
jiaoyangna
|
46efd9b960
|
关闭帮助界面
|
2021-06-19 17:50:23 +08:00 |
jiaoyangna
|
f4fe155533
|
大圣修改
|
2021-06-19 17:47:35 +08:00 |
JieLing
|
63e5f8a705
|
Merge branch 'china/local' into china/test
|
2021-06-19 17:29:38 +08:00 |
JieLing
|
21999e73a7
|
Merge branch 'china/dev' into china/local
|
2021-06-19 17:29:01 +08:00 |
JieLing
|
b0be50ccb8
|
Merge branch 'china/local' into china/test
|
2021-06-19 17:26:46 +08:00 |
jiaoyangna
|
b85b94fa68
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 17:07:20 +08:00 |
jiaoyangna
|
15361c2ef5
|
大圣跳转
|
2021-06-19 17:07:17 +08:00 |
wangzhenxing
|
5184ced8c8
|
[战斗]==============免疫buff清除提示修改
|
2021-06-19 16:41:00 +08:00 |
JieLing
|
be2a601edb
|
Merge branch 'china/dev' into china/local
|
2021-06-19 16:22:21 +08:00 |
jiaoyangna
|
8342399870
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:50:56 +08:00 |
jiaoyangna
|
46621252d9
|
惊喜礼包拍脸修改
|
2021-06-19 15:50:39 +08:00 |
gaoxin
|
d11833e088
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:46:05 +08:00 |
gaoxin
|
04c89ccaa9
|
【月卡】月卡激活提示修改到关闭奖励界面之后
|
2021-06-19 15:45:13 +08:00 |
jiaoyangna
|
b6b55590b3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:29:41 +08:00 |
jiaoyangna
|
67e5cbf8c9
|
大圣 不能查看详情修改
|
2021-06-19 15:29:31 +08:00 |
gaoxin
|
6d4d1fc49b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:28:27 +08:00 |
gaoxin
|
b423005b6e
|
【活动】页签使用原图大小
|
2021-06-19 15:28:22 +08:00 |
jiaoyangna
|
2e693575a6
|
抽卡提示只在神将抽里出现
|
2021-06-19 15:00:37 +08:00 |
jiaoyangna
|
bf1e1f69e6
|
添加以领取标志
|
2021-06-18 19:13:51 +08:00 |
jiaoyangna
|
89facf0425
|
添加红点检测
|
2021-06-18 19:04:44 +08:00 |
jiaoyangna
|
883fdceb78
|
Merge branch '0功能/升星预览' into china/dev-c
|
2021-06-18 19:00:51 +08:00 |
jiaoyangna
|
e267c0096b
|
预设提交
|
2021-06-18 18:56:46 +08:00 |
jiaoyangna
|
45a1079d88
|
大圣提交
|
2021-06-18 18:55:04 +08:00 |
ZhangBiao
|
9e5819433e
|
【新将来袭】
|
2021-06-18 18:45:56 +08:00 |
ZhangBiao
|
a957834228
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 18:38:29 +08:00 |
ZhangBiao
|
70a90b0148
|
【新将来袭】在线刷新修改
|
2021-06-18 18:38:17 +08:00 |
gaoxin
|
e0a3b3837c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 18:31:26 +08:00 |
jiaoyangna
|
60b2cf1cf6
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
|
2021-06-18 18:27:01 +08:00 |
gaoxin
|
f85dc798d3
|
【公告】公告id添加对不同渠道的处理
|
2021-06-18 18:25:51 +08:00 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +08:00 |
ZhangBiao
|
ddfe59a1d0
|
【升星有礼】
|
2021-06-18 18:17:36 +08:00 |
ZhangBiao
|
a05df3c77e
|
【升星有理】
|
2021-06-18 18:10:58 +08:00 |
ZhangBiao
|
78d2efc59c
|
【惊喜礼盒】提交
|
2021-06-18 18:01:27 +08:00 |
ZhangBiao
|
683964cd8a
|
【惊喜礼盒】资源更换
|
2021-06-18 17:52:09 +08:00 |
ZhangBiao
|
165a724ba3
|
【升星有理】
|
2021-06-18 17:29:00 +08:00 |
ZhangBiao
|
15172dab87
|
【升星有礼】
|
2021-06-18 17:17:52 +08:00 |
ZhangBiao
|
3744d8b901
|
【降妖夺宝】剩余时间限时修改
|
2021-06-18 17:06:20 +08:00 |
ZhangBiao
|
a277f4578c
|
【升星有礼】重构提交
|
2021-06-18 17:00:52 +08:00 |
jiaoyangna
|
12e0a2d0bb
|
拍脸修改提交
|
2021-06-18 15:53:42 +08:00 |
gaoxin
|
11934333fc
|
【技能】金吒技能特效新增
|
2021-06-18 15:29:07 +08:00 |
jiaoyangna
|
993bba8e0a
|
拍脸修改提交
(cherry picked from commit 8012c5691a)
|
2021-06-18 15:17:35 +08:00 |
jiaoyangna
|
8012c5691a
|
拍脸修改提交
|
2021-06-18 15:17:10 +08:00 |
ZhangBiao
|
a60e8a4329
|
【惊喜礼盒】底部回弹位置低
|
2021-06-18 15:06:53 +08:00 |
jiaoyangna
|
e593381b77
|
降妖夺宝修改提交
(cherry picked from commit 106647a69c)
|
2021-06-18 14:48:23 +08:00 |
jiaoyangna
|
106647a69c
|
降妖夺宝修改提交
|
2021-06-18 14:47:39 +08:00 |
ZhangBiao
|
6e617123b7
|
【新将来袭降妖夺宝】
|
2021-06-18 14:47:13 +08:00 |
gaoxin
|
21875c589f
|
【称号】称号特效显示兼容处理
|
2021-06-18 11:31:49 +08:00 |
jiaoyangna
|
09095e5b16
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
|
2021-06-18 11:08:40 +08:00 |
jiaoyangna
|
8b55bf1dc1
|
隐藏不显示的预设
|
2021-06-18 11:03:51 +08:00 |
jiaoyangna
|
65c09118ed
|
拍脸修改提交
|
2021-06-18 10:59:35 +08:00 |
jiaoyangna
|
c07ddcc6a8
|
拍脸修改提交
(cherry picked from commit 4635361d8b)
|
2021-06-18 10:50:21 +08:00 |
jiaoyangna
|
10c86e509a
|
超凡入圣修改提交
|
2021-06-18 10:50:04 +08:00 |
jiaoyangna
|
4635361d8b
|
拍脸修改提交
|
2021-06-18 10:48:49 +08:00 |
zhangqiang
|
667e53769a
|
【巅峰赛】8强界面不显示玩家名字
|
2021-06-17 20:53:33 +08:00 |
ZhangBiao
|
f02639f80b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-17 20:31:55 +08:00 |
ZhangBiao
|
958f2774e5
|
【新将来袭、降妖夺宝】重构提交
|
2021-06-17 20:31:47 +08:00 |
jiaoyangna
|
004121df8b
|
拍脸提交
|
2021-06-17 19:59:09 +08:00 |
jiaoyangna
|
8102e82829
|
资源提交
|
2021-06-17 19:33:16 +08:00 |
ZhangBiao
|
6ca32cdde3
|
【惊喜礼盒】提交
|
2021-06-17 18:50:19 +08:00 |
jiaoyangna
|
208c11555c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-17 18:17:42 +08:00 |
jiaoyangna
|
c102ce2478
|
拍脸修改提交
|
2021-06-17 18:17:38 +08:00 |
ZhangBiao
|
c9bf69310c
|
【升级豪礼】代码丢了,不是按照等级显示,需要重新修改
|
2021-06-17 18:05:39 +08:00 |
ZhangBiao
|
bd4796a4af
|
【惊喜礼盒】右侧文字格式修改
|
2021-06-17 18:04:10 +08:00 |
jiaoyangna
|
e5cacccd8a
|
Merge branch 'china/dev-inner' into china/dev-c
|
2021-06-17 17:57:44 +08:00 |
jiaoyangna
|
687a9ea45d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-17 17:57:39 +08:00 |
jiaoyangna
|
4c1cd67e6e
|
Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner
|
2021-06-17 17:56:51 +08:00 |
ZhangBiao
|
a6f4c307b5
|
【惊喜礼盒】
|
2021-06-17 17:55:14 +08:00 |
ZhangBiao
|
9b6e14eeb1
|
【惊喜礼盒】完成!
|
2021-06-17 17:43:56 +08:00 |
jiaoyangna
|
5c09522231
|
Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner
|
2021-06-17 17:19:27 +08:00 |
jiaoyangna
|
4f115efb05
|
活动提交
|
2021-06-17 17:18:42 +08:00 |
ZhangBiao
|
87f3fa8f64
|
【惊喜礼盒】提交
|
2021-06-17 17:09:36 +08:00 |
JieLing
|
6e7189162b
|
【先遣服】配置文件是从包版本26开始的
|
2021-06-17 17:00:20 +08:00 |
gaoxin
|
ac7501a1d5
|
【战斗】修复群体性的免疫效果不会正常消失的问题
|
2021-06-17 16:01:48 +08:00 |
ZhangBiao
|
54bc0f2caa
|
【惊喜礼盒】提价
|
2021-06-17 15:26:10 +08:00 |
jiaoyangna
|
6f5cd1d44a
|
惊喜礼包推送
|
2021-06-17 15:21:22 +08:00 |
jiaoyangna
|
bc20fa57fc
|
惊喜礼包推送修改提交
|
2021-06-17 15:05:44 +08:00 |
jiaoyangna
|
b1e3d0a163
|
Merge branch '0功能/升星预览' into china/dev-c
|
2021-06-17 15:05:03 +08:00 |
wangzhenxing
|
27b3d6e5c7
|
【战斗】=============被动56,被动283,被动324修改 不灭修改
|
2021-06-17 14:12:34 +08:00 |
gaoxin
|
23c17edfc7
|
【包配置】删除对喜扑的包的特殊处理
|
2021-06-17 10:43:39 +08:00 |
gaoxin
|
12bd0b64a1
|
Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
|
2021-06-17 10:26:13 +08:00 |
zhangqiang
|
8f97c36580
|
【鸿蒙阵】共鸣是breakId 计算修改
|
2021-06-17 10:10:22 +08:00 |
JieLing
|
6431157671
|
Merge remote-tracking branch 'origin/gx/china/stream' into china/zf_test
|
2021-06-17 10:01:56 +08:00 |
gaoxin
|
b8f9d894d9
|
【登录】修复logo为空时显示默认logo的问题
|
2021-06-16 20:38:42 +08:00 |
ZhangBiao
|
814fb29c45
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-16 19:56:18 +08:00 |
ZhangBiao
|
0b4c5f3c8f
|
【惊喜礼盒】提交
|
2021-06-16 19:56:10 +08:00 |
JieLing
|
447025cd5a
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:47:22 +08:00 |
gaoxin
|
6bd67926e7
|
【包配置】优化登录界面的打开速度,添加登录界面视频背景配置字段
|
2021-06-16 18:46:46 +08:00 |
JieLing
|
18be3ba841
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:35:39 +08:00 |
gaoxin
|
3b68cd422f
|
【无用log】
|
2021-06-16 18:35:07 +08:00 |
JieLing
|
964c216ecc
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:33:49 +08:00 |
jiaoyangna
|
9f2e0dbfd0
|
【ID1009503】 每日豪礼文字重新包装
|
2021-06-16 18:05:57 +08:00 |
gaoxin
|
c86cf619d0
|
【视频背景】尝试修复部分机型视频背景显示黑屏的问题
|
2021-06-16 17:30:54 +08:00 |
gaoxin
|
98b1518306
|
【添加stream配置】
|
2021-06-16 17:29:17 +08:00 |
jiaoyangna
|
27bfb84fb5
|
问号大小修改提交
|
2021-06-16 15:29:29 +08:00 |
jiaoyangna
|
0bfea18692
|
问号大小修改
|
2021-06-16 15:25:48 +08:00 |
jiaoyangna
|
a35b9d404b
|
数字修改提交
|
2021-06-16 15:14:36 +08:00 |
jiaoyangna
|
c5ecf50429
|
修改问号位置
|
2021-06-16 15:12:05 +08:00 |
zhangqiang
|
aa666a5158
|
【公会】带神印的成员信息报错
|
2021-06-16 14:50:19 +08:00 |
ZhangBiao
|
656c8b3359
|
【惊喜礼盒】提交
|
2021-06-16 11:59:52 +08:00 |
jiaoyangna
|
b83e8902d7
|
【ID1009368】
添加升星预览功能
|
2021-06-16 11:16:41 +08:00 |
zhangqiang
|
feb6480759
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-16 10:53:21 +08:00 |
JieLing
|
b7e78d9d5f
|
Revert Revert "【包配置】将登录图配置放到streaming文件夹"
|
2021-06-16 10:44:12 +08:00 |
wangzhenxing
|
b1425236af
|
[战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交
|
2021-06-16 10:27:56 +08:00 |
gaoxin
|
b3fca866e8
|
Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
|
2021-06-16 10:09:15 +08:00 |
gaoxin
|
3dc9dd5d64
|
Revert "【山河试炼】界面提交"
This reverts commit fbc5316b01.
|
2021-06-16 10:09:04 +08:00 |
gaoxin
|
0e2ec48bdc
|
Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
|
2021-06-16 10:08:52 +08:00 |
gaoxin
|
a4fa7cacff
|
Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
|
2021-06-16 10:08:41 +08:00 |
gaoxin
|
67e44741f6
|
Revert "【山河试炼】增加主城红点检测"
This reverts commit e0e8974850.
|
2021-06-16 10:08:34 +08:00 |
ZhangBiao
|
e0e8974850
|
【山河试炼】增加主城红点检测
|
2021-06-15 20:39:05 +08:00 |
ZhangBiao
|
160a3e1a6f
|
【山河试炼】差红点的检测
|
2021-06-15 20:33:22 +08:00 |
JieLing
|
91bf6b36af
|
Merge branch 'china/local' into china/test
|
2021-06-15 18:10:18 +08:00 |
JieLing
|
84a42dd0ef
|
Merge branch 'china/dev' into china/local
|
2021-06-15 18:09:51 +08:00 |
ZhangBiao
|
8cd3afb034
|
【山河试炼】代码提交
|
2021-06-15 15:46:01 +08:00 |
ZhangBiao
|
fbc5316b01
|
【山河试炼】界面提交
|
2021-06-15 14:25:22 +08:00 |
zhangqiang
|
75cbaba02e
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-15 12:17:13 +08:00 |
ZhangBiao
|
173fef6dca
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-15 11:40:56 +08:00 |
ZhangBiao
|
4df5b08d1f
|
【山河试炼】开坑
|
2021-06-15 11:40:47 +08:00 |
gaoxin
|
13d7b61e35
|
【神将信息】修复切换到装备界面返回无法切换页签的问题
|
2021-06-15 11:17:15 +08:00 |
ZhangBiao
|
6152c52f2c
|
【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容
|
2021-06-15 10:22:32 +08:00 |
gaoxin
|
46c1fb1070
|
【森罗】修复转盘游戏点击报错
|
2021-06-11 20:40:10 +08:00 |
gaoxin
|
2140a69391
|
【森罗】修复转盘游戏点击报错
|
2021-06-11 20:15:44 +08:00 |
gaoxin
|
8df099eabc
|
【资源】草花loading图替换
|
2021-06-11 18:28:05 +08:00 |
gaoxin
|
0f68517a69
|
【资源】草花loading图替换
|
2021-06-11 17:37:32 +08:00 |
gaoxin
|
20dd0067d3
|
【资源】喜扑登录背景图替换
|
2021-06-11 16:11:01 +08:00 |
gaoxin
|
627a623a37
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-11 16:10:33 +08:00 |
gaoxin
|
ebd4135226
|
【资源】喜扑登录背景图替换
|
2021-06-11 16:10:12 +08:00 |
jiaoyangna
|
fe1570f667
|
神将详情界面修改提交
|
2021-06-11 16:09:42 +08:00 |
ZhangBiao
|
4edff2eee8
|
【升级限量礼包】无剩余礼包逻辑缺失修复
(cherry picked from commit ca9a0199b7)
|
2021-06-11 14:10:10 +08:00 |
ZhangBiao
|
173773517f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-11 14:05:17 +08:00 |
ZhangBiao
|
ca9a0199b7
|
【升级限量礼包】无剩余礼包逻辑缺失修复
|
2021-06-11 14:05:03 +08:00 |
wangzhenxing
|
588ca169c9
|
[战斗]======被动200去掉注释
|
2021-06-11 11:51:52 +08:00 |
zhangqiang
|
a9ce0d077e
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-11 10:58:51 +08:00 |
jiaoyangna
|
ed4472a298
|
挂机卡死修改提交
|
2021-06-11 10:48:11 +08:00 |
jiaoyangna
|
e89a0d26c8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-11 10:31:16 +08:00 |
jiaoyangna
|
2419089ff4
|
【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
|
2021-06-11 10:30:57 +08:00 |
jiaoyangna
|
11bb03fd2b
|
【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
|
2021-06-11 10:18:38 +08:00 |
gaoxin
|
06875b8986
|
【包配置】喜扑多渠道处理
|
2021-06-11 08:58:15 +08:00 |
gaoxin
|
28c7d285a0
|
Revert "【包配置】将登录图配置放到streaming文件夹"
This reverts commit 03d56901d7.
|
2021-06-11 02:36:08 +08:00 |
gaoxin
|
03d56901d7
|
【包配置】将登录图配置放到streaming文件夹
|
2021-06-11 01:48:39 +08:00 |
gaoxin
|
77acfd6bcd
|
【登录】版号信息走表配置
|
2021-06-11 01:45:09 +08:00 |
jiaoyangna
|
e764f74e6d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 23:01:07 +08:00 |
jiaoyangna
|
65860bb337
|
删除剧情对话挂机地图音效
|
2021-06-10 22:59:26 +08:00 |
gaoxin
|
4ee928c2d4
|
Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c
|
2021-06-10 22:56:18 +08:00 |
JieLing
|
530374e00b
|
【资源】循环引用资源优化
|
2021-06-10 22:53:11 +08:00 |
jiaoyangna
|
b76f517cbb
|
[战斗]===============被动200修改 同阵营这个被动只会触发一次
|
2021-06-10 22:08:51 +08:00 |
wangzhenxing
|
4165e6acd5
|
【战斗】=======注释之前被动200修改
|
2021-06-10 22:02:35 +08:00 |
wangzhenxing
|
77121e01e3
|
[战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个
|
2021-06-10 21:57:00 +08:00 |
jiaoyangna
|
83553d8aef
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 20:17:03 +08:00 |
jiaoyangna
|
04633b4ece
|
无尽副本快速返回主城报错
|
2021-06-10 20:16:44 +08:00 |
zhangqiang
|
23f90ccf52
|
【线上】【鸿蒙阵】共鸣装备无法卸下,弹服务器开小差
|
2021-06-10 18:37:16 +08:00 |
JieLing
|
2e798c6888
|
【资源名重复】
|
2021-06-10 18:24:59 +08:00 |
zhangqiang
|
5d57464da8
|
【森罗音效】福星高照老头的音效,界面关闭不停
|
2021-06-10 17:56:07 +08:00 |
jiaoyangna
|
529067bb2f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 17:44:20 +08:00 |
jiaoyangna
|
e087d4c57c
|
ID1016424】
【无尽副本】反复从无尽地图返回主城报错
|
2021-06-10 17:43:52 +08:00 |
zhangqiang
|
4915842ee2
|
【山河社稷图】奖励排序
|
2021-06-10 17:05:51 +08:00 |
jiaoyangna
|
ddd0ece70b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:38:43 +08:00 |
jiaoyangna
|
819278dd3d
|
【ID1016436】
【无尽副本】战斗结算界面有经验
|
2021-06-10 16:38:19 +08:00 |
gaoxin
|
fbe1acdf43
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:38:18 +08:00 |
gaoxin
|
8494dd02d7
|
【立绘错位】尝试修复神将卡牌上有时会出现立绘错位
|
2021-06-10 16:37:44 +08:00 |
zhangqiang
|
3506d2bb2c
|
【页签图标替换】局部 + 修行提示文字修改
|
2021-06-10 16:33:43 +08:00 |
jiaoyangna
|
8115705d1a
|
【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
|
2021-06-10 16:30:49 +08:00 |
gaoxin
|
0458ee7bf7
|
【debug】修复部分报错导致报错的问题。。。
|
2021-06-10 16:11:02 +08:00 |
gaoxin
|
4382e822e0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:10:18 +08:00 |
gaoxin
|
aa4f3df8b0
|
【拍脸】优化短时间触发拍脸有可能导致报错的问题
|
2021-06-10 16:10:12 +08:00 |
jiaoyangna
|
f5a9a1368d
|
【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
|
2021-06-10 16:08:26 +08:00 |
jiaoyangna
|
fed713464c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:00:23 +08:00 |