zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
gaoxin
|
f519c35bbd
|
【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。
|
2020-10-30 13:28:19 +08:00 |
jiaoyangna
|
39dbd3f640
|
逍遥游幸运转盘提交
|
2020-10-30 13:27:45 +08:00 |
jiaoyangna
|
1e2688e84c
|
【运筹帷幄】乾坤宝盒活动详情中的概率公示,少一个魂印
|
2020-10-30 10:09:11 +08:00 |
ZhangBiao
|
33e1ba20e8
|
【社稷大典】商店适配
|
2020-10-27 16:32:43 +08:00 |
ZhangBiao
|
35f6a6c430
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
|
2020-10-27 16:16:10 +08:00 |
ZhangBiao
|
acd3f336e9
|
【设计大典】特效添加
|
2020-10-27 16:15:34 +08:00 |
JieLing
|
4b522dd9ea
|
【积天豪礼】$1 -> $0.99
|
2020-10-27 13:51:11 +08:00 |
JieLing
|
7870934f0c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:58:03 +08:00 |
yuanshuai
|
0ea67ffa33
|
【逍遥游】骰子动画优化,隐藏动画下面的黑影
|
2020-10-26 18:57:45 +08:00 |
jiaoyangna
|
5d3d65871a
|
[主题活动-社稷大典]商店立绘重叠提交
|
2020-10-26 18:44:57 +08:00 |
ZhangBiao
|
6eea05fa06
|
【竞技场】领奖界面报错修改
|
2020-10-26 17:30:26 +08:00 |
jiaoyangna
|
d8f5a48811
|
【累计充值】提示修改
|
2020-10-26 16:51:47 +08:00 |
ZhangBiao
|
b2c841e572
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:11:11 +08:00 |
ZhangBiao
|
709dc1a5bd
|
【社稷大典】时间弹跳修复,物品边框颜色修改
|
2020-10-26 16:10:58 +08:00 |
yuanshuai
|
0fee60ea37
|
【逍遥游】骰子动画修改
|
2020-10-26 15:19:33 +08:00 |
jiaoyangna
|
ce5db82250
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:05:59 +08:00 |
ZhangBiao
|
6407abc8c9
|
【社稷大典】提交8 漏题补
|
2020-10-26 11:53:53 +08:00 |
ZhangBiao
|
0bf6e05add
|
【社稷大典】提交6
|
2020-10-24 18:58:07 +08:00 |
ZhangBiao
|
a2a870f421
|
【社稷大典】提交4
|
2020-10-24 18:41:21 +08:00 |
ZhangBiao
|
a62dc62ead
|
【社稷大典】提交
|
2020-10-24 18:20:43 +08:00 |
yuanshuai
|
3b10d60477
|
自动游历功能屏蔽
|
2020-10-20 16:25:14 +08:00 |
yuanshuai
|
885de6fe9b
|
逍遙游自动游历开启 相关脚本资源提交
|
2020-10-20 16:17:13 +08:00 |
JieLing
|
94b5898ba0
|
【逍遥游】优化奖励界面显示
|
2020-10-20 02:21:32 +08:00 |
JieLing
|
bb2b8b1818
|
【竞技场】修复奖励界面打不开的问题
|
2020-10-20 01:56:42 +08:00 |
jiaoyangna
|
d39c078888
|
xiaoyao commit
|
2020-10-19 23:37:24 +08:00 |
yuanshuai
|
0d4fd1a210
|
骰子动画添加提交
|
2020-10-19 22:56:56 +08:00 |
ZhangBiao
|
a40b0dab17
|
逍遥游 commit
|
2020-10-19 22:38:57 +08:00 |
ZhangBiao
|
021692dc42
|
逍遥commit
|
2020-10-19 22:36:43 +08:00 |
yuanshuai
|
a19942820e
|
自动游历功能屏蔽
|
2020-10-19 21:40:53 +08:00 |
yuanshuai
|
3b8317a897
|
逍遥游红点提交
|
2020-10-19 21:40:48 +08:00 |
yuanshuai
|
131d1aab1b
|
【逍遥游】红点和帮助弹窗提交
|
2020-10-19 21:39:48 +08:00 |
gaoxin
|
19135670ce
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-19 20:40:14 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
ZhangBiao
|
56f5856a71
|
宝箱个数减负
|
2020-10-19 20:10:53 +08:00 |
ZhangBiao
|
4c5065ccf7
|
竞技场界面修改
|
2020-10-19 18:52:36 +08:00 |
ZhangBiao
|
09c3da664e
|
通用奖励界面 设计大典->竞技场界面修改
|
2020-10-19 13:54:08 +08:00 |
ZhangBiao
|
bae7d6550e
|
竞技场界面修改
|
2020-10-16 19:36:21 +08:00 |
jiaoyangna
|
9706c45942
|
主题活动修改
|
2020-10-10 16:15:27 +08:00 |
jiaoyangna
|
aa9878a1f2
|
势不可挡 提交
|
2020-10-10 16:14:18 +08:00 |
jiaoyangna
|
04e6526819
|
神州令修改提交
|
2020-10-15 21:48:41 +08:00 |
ZhangBiao
|
2469c75f90
|
森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34)
(cherry picked from commit 677dca14e7)
|
2020-10-13 14:01:47 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
ZhangBiao
|
2e45c0cd83
|
主题活动预设修改
|
2020-10-15 14:05:24 +08:00 |
zhangqiang
|
fc45eaf562
|
四元阵单抽卡适配
|
2020-09-28 17:53:46 +08:00 |
jiaoyangna
|
6f0b87c858
|
轩辕适配修改,文字颜色修改
|
2020-09-28 16:56:22 +08:00 |
JieLing
|
170b706504
|
修复引导商店报错
|
2020-09-28 11:13:11 +08:00 |
JieLing
|
823ae72aec
|
修复0元礼包无法购买的问题,修复引导合成碎片卡死
|
2020-09-28 10:27:06 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
JieLing
|
c3cce0b06e
|
百宝商会活动添加
|
2020-09-27 16:52:40 +08:00 |
ZhangBiao
|
def3e829ff
|
三界降魔
|
2020-09-27 16:44:39 +08:00 |
ZhangBiao
|
97f9b8f671
|
遴选三界除魔
|
2020-09-27 16:44:31 +08:00 |
ZhangBiao
|
d601794a17
|
三界降魔
|
2020-09-27 16:43:49 +08:00 |
ZhangBiao
|
e9b994126e
|
三界降魔
|
2020-09-27 16:43:42 +08:00 |
ZhangBiao
|
c4706208ef
|
三界除魔功能添加
|
2020-09-27 16:43:33 +08:00 |
gaoxin
|
5b7e3c7a9b
|
每日一键购买礼包金额显示添加
|
2020-09-27 16:15:46 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
gaoxin
|
7b7def3f8f
|
勇冠三军,叱咤风云活动添加
|
2020-09-27 16:09:55 +08:00 |
ZhangBiao
|
e3b387b8af
|
十绝阵奖励偏移修改
|
2020-09-22 17:39:14 +08:00 |
JieLing
|
d440edea11
|
打开兑换码功能
|
2020-09-09 20:12:11 +08:00 |
zhangqiang
|
604de656df
|
巅峰赛战斗结束界面适配
|
2020-09-07 15:39:57 +08:00 |
gaoxin
|
a46ee1c52c
|
修复引导急速探索报错的问题
|
2020-09-07 15:26:37 +08:00 |
zhangqiang
|
5a917b1374
|
巅峰赛详情适配
|
2020-09-07 15:02:16 +08:00 |
gaoxin
|
06afe99236
|
宽屏边缘用图片代替黑边
|
2020-09-05 19:02:20 +08:00 |
gaoxin
|
7afe25a5d2
|
界面适配修改,引导添加网络延时检测
|
2020-09-05 17:21:09 +08:00 |
gaoxin
|
338b7b4375
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-05 16:44:07 +08:00 |
gaoxin
|
3103a4122b
|
设置,几天好礼界面内容修改
|
2020-09-05 16:43:53 +08:00 |
zhangqiang
|
f8508a8663
|
shipei
|
2020-09-05 16:43:25 +08:00 |
gaoxin
|
68c9726917
|
屏幕适配修改
|
2020-09-05 16:39:10 +08:00 |
zhangqiang
|
21e7bf2e80
|
shi pei
|
2020-09-05 16:28:52 +08:00 |
zhangqiang
|
f36b3c7879
|
shi pei
|
2020-09-05 16:16:10 +08:00 |
zhangqiang
|
0d82f376b0
|
shi pei
|
2020-09-05 15:28:44 +08:00 |
zhangqiang
|
c35058767b
|
shi pei
|
2020-09-05 15:20:30 +08:00 |
zhangqiang
|
96e795c7c5
|
全屏界面 背景图片适配脚本 自行挂载
|
2020-09-05 14:22:53 +08:00 |
gaoxin
|
fb6a6c9da5
|
添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备
|
2020-09-05 12:30:00 +08:00 |
gaoxin
|
92a8b93b50
|
修改屏幕的适配方式,修改计算屏幕位置的方法
|
2020-09-05 12:15:58 +08:00 |
zhangqiang
|
9937727ede
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 18:35:40 +08:00 |
zhangqiang
|
6b55198f12
|
周月礼包替图
|
2020-09-04 18:35:30 +08:00 |
ZhangBiao
|
aec554c002
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 18:06:49 +08:00 |
ZhangBiao
|
f6fde7a2c8
|
试炼副本增加动效
|
2020-09-04 18:04:54 +08:00 |
zhangqiang
|
cbad6e10cd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:51:05 +08:00 |
zhangqiang
|
bbd5d3bda2
|
成长基金
|
2020-09-04 17:50:50 +08:00 |
ZhangBiao
|
4b50f8408b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:46:35 +08:00 |
ZhangBiao
|
63cde2092d
|
无尽副本界面动效增加
|
2020-09-04 17:46:27 +08:00 |
zhangqiang
|
f6a3178926
|
xiugai
|
2020-09-04 17:34:59 +08:00 |
ZhangBiao
|
606ecfe6b2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:33:53 +08:00 |
ZhangBiao
|
5330808e19
|
送神祠动效增加
|
2020-09-04 17:33:42 +08:00 |
zhangqiang
|
56092d5572
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:21:51 +08:00 |
ZhangBiao
|
f9ed1f14be
|
化虚境动效添加
|
2020-09-04 17:21:21 +08:00 |
zhangqiang
|
d1e44c360d
|
xiugai
|
2020-09-04 17:21:16 +08:00 |
ZhangBiao
|
7da522065d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:03:45 +08:00 |
ZhangBiao
|
70d3fcfe9f
|
断器阁动效增加
|
2020-09-04 17:03:37 +08:00 |
jiaoyangna
|
5a861862d5
|
商店添加动画
|
2020-09-04 16:54:58 +08:00 |
jiaoyangna
|
f6686cb1ae
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 15:06:19 +08:00 |
jiaoyangna
|
b3b001c0df
|
装备魂印黑边
|
2020-09-04 15:05:14 +08:00 |
ZhangBiao
|
70f553b732
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 14:35:25 +08:00 |
ZhangBiao
|
8232879006
|
车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
|
2020-09-04 14:30:39 +08:00 |
zhangqiang
|
1c59eb5ff4
|
编队提示文字适配
|
2020-09-04 11:33:33 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |