ZhangBiao
|
33866686ba
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 17:01:12 +08:00 |
ZhangBiao
|
a277f4578c
|
【升星有礼】重构提交
|
2021-06-18 17:00:52 +08:00 |
gaoxin
|
7fe73cca9e
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
|
2021-06-18 16:04:33 +08:00 |
gaoxin
|
e88dcb7863
|
【热更】脚本优化,添加自动打tag的功能
|
2021-06-18 16:03:27 +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 |
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 |
ZhangBiao
|
6e617123b7
|
【新将来袭降妖夺宝】
|
2021-06-18 14:47:13 +08:00 |
gaoxin
|
21875c589f
|
【称号】称号特效显示兼容处理
|
2021-06-18 11:31:49 +08:00 |
gaoxin
|
74c5cd04c4
|
【配置】开启高帧率
|
2021-06-18 11:17:11 +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 |
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 |
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 |
ZhangBiao
|
87f3fa8f64
|
【惊喜礼盒】提交
|
2021-06-17 17:09:36 +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 |
gaoxin
|
87032a513a
|
【配置】无用配置文件删除
|
2021-06-17 11:45:11 +08:00 |
gaoxin
|
d06bdbadd1
|
【打包配置】修改商务服的打包分支
|
2021-06-17 11:21:05 +08:00 |
gaoxin
|
0138a9576f
|
【打包工具】添加根据分支判断要打的包,添加灵动商务服配置
|
2021-06-17 11:16:11 +08:00 |
gaoxin
|
562b57db73
|
【场景】新增猕猴桃商务出包场景
|
2021-06-17 10:59:20 +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 |
JieLing
|
a9685687a3
|
Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test
|
2021-06-17 10:01:30 +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 |
gaoxin
|
4f28f777b9
|
【添加包配置说明文件】
|
2021-06-16 18:55:11 +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 |