jiaoyangna
|
0e752b76a6
|
每日礼包 换天自动刷新修改
|
2021-04-01 16:12:20 +08:00 |
ZhangBiao
|
e86078ce69
|
【十五日登陆】
|
2021-04-01 16:04:13 +08:00 |
jiaoyangna
|
b21ed5a44e
|
礼包修改提交
|
2021-04-01 15:42:59 +08:00 |
jiaoyangna
|
b663c351b3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-01 14:56:50 +08:00 |
jiaoyangna
|
ae17483a8e
|
灵兽 修改提交
|
2021-04-01 14:56:47 +08:00 |
zhangqiang
|
1d4c446c33
|
【大闹天宫】复活节点无法复活助战神将
|
2021-04-01 14:46:07 +08:00 |
zhangqiang
|
aa17c175b7
|
【无尽副本】阵亡神将可以一键上阵
|
2021-04-01 14:05:21 +08:00 |
jiaoyangna
|
a6428eaaed
|
红点 修改提交
|
2021-04-01 13:44:05 +08:00 |
jiaoyangna
|
9bfd85bb0a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-01 12:30:59 +08:00 |
jiaoyangna
|
c70343585a
|
主题活动 修改
|
2021-04-01 12:30:37 +08:00 |
zhangqiang
|
a20dc99f99
|
【大闹天宫】挑战失败后显示两个可挑战图标,点击另一个未挑战过的怪没反应,退出重进显示正常
|
2021-04-01 10:39:03 +08:00 |
zhangqiang
|
264a682b4b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 22:40:35 +08:00 |
zhangqiang
|
872b779aff
|
【日常任务】日常任务活跃奖励 点的过快第二个宝箱就会没反应
|
2021-03-31 22:40:07 +08:00 |
gaoxin
|
01aacccfaf
|
【红点】修复方法名错误
|
2021-03-31 22:31:36 +08:00 |
zhangqiang
|
987179041c
|
【创建名字】boy
|
2021-03-31 22:25:54 +08:00 |
jiaoyangna
|
784ace13b5
|
红点提交
|
2021-03-31 22:22:53 +08:00 |
zhangqiang
|
e05a69f3a4
|
【福利保箱】
|
2021-03-31 21:51:14 +08:00 |
jiaoyangna
|
618e3a5014
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 21:46:18 +08:00 |
jiaoyangna
|
7d055c4e3a
|
红点提交
|
2021-03-31 21:46:14 +08:00 |
zhangqiang
|
957aff00a5
|
【放生灵兽白片】
|
2021-03-31 21:19:56 +08:00 |
jiaoyangna
|
56605c0ab7
|
购买特权 刷新礼包 修改
|
2021-03-31 19:56:31 +08:00 |
jiaoyangna
|
02fde882a8
|
妖晶不足跳转修改
|
2021-03-31 19:33:12 +08:00 |
jiaoyangna
|
85c09e3094
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:30:56 +08:00 |
jiaoyangna
|
104f52f61b
|
特权礼包滑动位置 修改
|
2021-03-31 19:30:45 +08:00 |
zhangqiang
|
4698fc6dbf
|
【福利签到】bug
|
2021-03-31 19:26:44 +08:00 |
jiaoyangna
|
61426fba07
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:08:04 +08:00 |
jiaoyangna
|
e73cf4533b
|
报错修改
|
2021-03-31 19:07:50 +08:00 |
gaoxin
|
5f16021a0e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:06:34 +08:00 |
gaoxin
|
9c080a0cac
|
【激素探索】按钮扫光光效修改
|
2021-03-31 19:06:16 +08:00 |
jiaoyangna
|
292515e12e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:41:47 +08:00 |
ZhangBiao
|
2204717b5a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:40:34 +08:00 |
jiaoyangna
|
4365e8afff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:39:02 +08:00 |
jiaoyangna
|
f8245898b0
|
特权礼包修改提交
|
2021-03-31 18:38:57 +08:00 |
zhangqiang
|
c2df1a807b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:29:00 +08:00 |
zhangqiang
|
d131bdbadd
|
【适配】
|
2021-03-31 18:28:46 +08:00 |
jiaoyangna
|
5574c4bdac
|
灵兽特权 显示光效修改
|
2021-03-31 18:02:37 +08:00 |
jiaoyangna
|
0c43f05161
|
灵兽秘卷修改
|
2021-03-31 18:00:44 +08:00 |
ZhangBiao
|
9b533a698b
|
【适配】
|
2021-03-31 17:55:47 +08:00 |
jiaoyangna
|
39b457f544
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:55:39 +08:00 |
jiaoyangna
|
29d8059755
|
特效修改
|
2021-03-31 17:55:33 +08:00 |
zhangqiang
|
60353d6dbd
|
【归元优化】bug
|
2021-03-31 17:40:51 +08:00 |
zhangqiang
|
c6425d9fe9
|
【称号坐骑时装】三界降魔
|
2021-03-31 17:30:05 +08:00 |
jiaoyangna
|
d5c743e302
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:25:16 +08:00 |
jiaoyangna
|
c8dd5845ac
|
成长礼包修改提交
|
2021-03-31 17:25:11 +08:00 |
ZhangBiao
|
d970a91c95
|
【三界除魔】入口消失修复
(cherry picked from commit 31f1354b19)
|
2021-03-31 17:01:50 +08:00 |
ZhangBiao
|
c1276ff0c4
|
【十五日登陆】界面
|
2021-03-31 17:00:35 +08:00 |
ZhangBiao
|
31f1354b19
|
【三界除魔】入口消失修复
|
2021-03-31 16:59:56 +08:00 |
jiaoyangna
|
14e2e0dd2a
|
挑战特权商店特效显示
|
2021-03-31 16:09:15 +08:00 |
zhangqiang
|
7102efae35
|
【车迟斗法】当前排名奖励箱子和奖励列表箱子内容不一样
|
2021-03-31 15:58:47 +08:00 |
ZhangBiao
|
38e4f42b7e
|
【十五日登陆】
|
2021-03-31 15:52:11 +08:00 |
zhangqiang
|
c5a233df09
|
【称号坐骑时装】逍遥游
|
2021-03-31 15:39:40 +08:00 |
ZhangBiao
|
1c2f1d23c0
|
【十五日登陆】开坑
|
2021-03-31 15:02:04 +08:00 |
jiaoyangna
|
ce617c94be
|
累计充值修改提交
|
2021-03-31 14:50:11 +08:00 |
jiaoyangna
|
fbe2dc4769
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:43:11 +08:00 |
jiaoyangna
|
2fa125f70e
|
特权礼包特效修改
|
2021-03-31 14:43:08 +08:00 |
ZhangBiao
|
5142db7d00
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:33:11 +08:00 |
ZhangBiao
|
c287216995
|
【适配】限时神装
|
2021-03-31 14:33:01 +08:00 |
gaoxin
|
50fcc0e03b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:29:26 +08:00 |
gaoxin
|
35ed5c2854
|
【挂机】修复关卡未解锁时按钮状态显示错误的问题
|
2021-03-31 14:28:57 +08:00 |
jiaoyangna
|
6af6f89c18
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:25:47 +08:00 |
jiaoyangna
|
43da7e2d51
|
十绝阵提交
|
2021-03-31 14:25:43 +08:00 |
ZhangBiao
|
94714c1ce4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 13:32:44 +08:00 |
ZhangBiao
|
beee0ed0b3
|
【适配】无尽副本
|
2021-03-31 13:32:23 +08:00 |
zhangqiang
|
3b7b310c8b
|
【适配】
|
2021-03-31 12:00:55 +08:00 |
jiaoyangna
|
9350e899f9
|
特权礼包倒计时修改提交
|
2021-03-31 11:55:16 +08:00 |
jiaoyangna
|
c2f1f923ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:27:09 +08:00 |
jiaoyangna
|
8c87d221fb
|
活动 动态加载改名
|
2021-03-31 11:26:55 +08:00 |
zhangqiang
|
d2ab50c096
|
【特权优化】公会漏提
|
2021-03-31 11:20:45 +08:00 |
ZhangBiao
|
18dc0e7d0f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 10:37:50 +08:00 |
ZhangBiao
|
210a2069a5
|
【福星高照】拍脸修改
|
2021-03-31 10:28:48 +08:00 |
zhangqiang
|
81c7353e3e
|
【特权优化】vip漏提
|
2021-03-31 10:17:36 +08:00 |
zhangqiang
|
4c7bd53d20
|
【称号坐骑时装】战力向后的发送请求
|
2021-03-31 10:16:52 +08:00 |
jiaoyangna
|
f30b4ea7eb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:59:05 +08:00 |
jiaoyangna
|
965f9c19e9
|
特权添加时间
|
2021-03-30 22:59:01 +08:00 |
ZhangBiao
|
6a89c381f1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:42:30 +08:00 |
ZhangBiao
|
afcfa71db7
|
【福星高照】不关闭修复
|
2021-03-30 22:42:17 +08:00 |
zhangqiang
|
8bff7d2ab9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:37:57 +08:00 |
zhangqiang
|
d9e3aa939d
|
【称号坐骑时装】
|
2021-03-30 22:37:45 +08:00 |
jiaoyangna
|
dea7c12ded
|
层级报错 修改
|
2021-03-30 22:36:31 +08:00 |
jiaoyangna
|
3684b8fec1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:29:07 +08:00 |
jiaoyangna
|
e9803f2760
|
文字错乱修改
|
2021-03-30 22:28:56 +08:00 |
zhangqiang
|
0370fb5610
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:22:13 +08:00 |
zhangqiang
|
40cc3683f9
|
【称号坐骑时装】中地图修改
|
2021-03-30 22:22:01 +08:00 |
jiaoyangna
|
b7a0cca0fe
|
成长基金修改提交
|
2021-03-30 22:19:54 +08:00 |
jiaoyangna
|
6a16612ab1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:07:05 +08:00 |
jiaoyangna
|
c69cc0cc14
|
每日充值显示错误修改
|
2021-03-30 22:06:59 +08:00 |
ZhangBiao
|
d4b843d972
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:03:59 +08:00 |
ZhangBiao
|
4dcdd67648
|
【极速探索优化】更改极速探索界面,突出激活探索特权的按钮
|
2021-03-30 22:01:58 +08:00 |
zhangqiang
|
ecf18e4b5a
|
【称号坐骑时装】大地图修改
|
2021-03-30 21:11:27 +08:00 |
jiaoyangna
|
ed6e825266
|
去掉限时抢购
|
2021-03-30 21:04:48 +08:00 |
jiaoyangna
|
ad24255948
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 21:02:36 +08:00 |
gaoxin
|
41c646817b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 20:46:55 +08:00 |
gaoxin
|
6e34c88fa5
|
【人物信息栏】修复战力刷新不及时的问题
|
2021-03-30 20:46:47 +08:00 |
jiaoyangna
|
ef9d80e9b0
|
刷新资源 提交
|
2021-03-30 20:44:24 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
jiaoyangna
|
833aaec022
|
活动 提交
|
2021-03-30 20:35:53 +08:00 |
wangzhenxing
|
1a3086a2e3
|
【战斗】==============被动168 修改 bugId: 1014123
|
2021-03-30 20:33:39 +08:00 |
jiaoyangna
|
1465efa8b2
|
活动 提交
|
2021-03-30 20:32:05 +08:00 |
ZhangBiao
|
98a49ad693
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
|
2021-03-30 20:28:12 +08:00 |
ZhangBiao
|
2984f6f63b
|
【注释】注释部分log
|
2021-03-30 20:27:40 +08:00 |
gaoxin
|
1973afd058
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 20:23:06 +08:00 |
gaoxin
|
c88cd5b7e1
|
【主界面】扩大场景的显示范围
|
2021-03-30 20:22:57 +08:00 |
ZhangBiao
|
62a064b33e
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
|
2021-03-30 20:21:32 +08:00 |
zhangqiang
|
d6c61b7a11
|
【归元修改】向后的发送战力改变
|
2021-03-30 20:20:42 +08:00 |
ZhangBiao
|
9ed1f4f8c2
|
【福星高照】增加拍脸
|
2021-03-30 20:20:12 +08:00 |
zhangqiang
|
ea9d0ba287
|
【称号坐骑时装】 激活时 向后的发送战力改变
|
2021-03-30 20:20:00 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +08:00 |
gaoxin
|
c2a5c2dc17
|
【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i
|
2021-03-30 19:54:19 +08:00 |
zhangqiang
|
cfaeff6759
|
【特权优化】 vip 公会 vip 升级战力提升
|
2021-03-30 19:49:49 +08:00 |
zhangqiang
|
365a694eca
|
【称号坐骑时装】 跳章节修改
|
2021-03-30 19:18:32 +08:00 |
JieLing
|
d481718145
|
Merge branch 'xma/dev' into master_xma_local
|
2021-03-30 19:02:16 +08:00 |
gaoxin
|
47c84d8c79
|
【bug】修复好友请求无法正常显示的问题
|
2021-03-30 19:01:40 +08:00 |
ZhangBiao
|
d61c55d24d
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 18:55:35 +08:00 |
ZhangBiao
|
685ace078a
|
【福星高照】增加协议
|
2021-03-30 18:50:15 +08:00 |
gaoxin
|
8161aca202
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 18:42:38 +08:00 |
gaoxin
|
3cc0b51edd
|
【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题
|
2021-03-30 18:42:30 +08:00 |
jiaoyangna
|
c2fac79eca
|
活动 提交
|
2021-03-30 18:26:10 +08:00 |
jiaoyangna
|
d860db875d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 18:19:12 +08:00 |
jiaoyangna
|
7d9a5a62ba
|
天书秘卷 提交
|
2021-03-30 18:18:16 +08:00 |
zhangqiang
|
127a019a1b
|
【归元修改】漏提
|
2021-03-30 18:13:05 +08:00 |
gaoxin
|
202658d6d9
|
【特权优化】将界面顶部的特权等级移回
|
2021-03-30 18:10:39 +08:00 |
ZhangBiao
|
e3fb9025a9
|
【福星高照】提交
|
2021-03-30 17:53:01 +08:00 |
gaoxin
|
81a87576a3
|
【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失
|
2021-03-30 17:44:44 +08:00 |
gaoxin
|
59fdb6d2aa
|
Merge remote-tracking branch 'origin/xma/dev' into master_xma_local
|
2021-03-30 17:43:39 +08:00 |
gaoxin
|
1689489c3c
|
【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失
|
2021-03-30 17:43:22 +08:00 |
zhangqiang
|
aabe3e082f
|
【归元修改】资源提交
|
2021-03-30 17:31:44 +08:00 |
wangzhenxing
|
33852141c6
|
【战斗】============被动245 去除 是不是追加技能得判断
|
2021-03-30 17:27:37 +08:00 |
gaoxin
|
03da04762b
|
Merge remote-tracking branch 'origin/xma/dev' into master_xma_local
|
2021-03-30 17:26:16 +08:00 |
gaoxin
|
187ec35fbd
|
【GM】修改获取战斗数据的GM服务器地址
|
2021-03-30 17:25:03 +08:00 |
wangzhenxing
|
3fc6c20439
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 17:17:47 +08:00 |
zhangqiang
|
82b1de6537
|
【称号坐骑时装】飘战力 快捷跳转
|
2021-03-30 17:17:11 +08:00 |
wangzhenxing
|
cda352d46e
|
【战斗】==========选择对位目标逻辑修改
|
2021-03-30 17:17:10 +08:00 |
ZhangBiao
|
d3d363762b
|
【福星高照】完成
|
2021-03-30 16:55:45 +08:00 |
zhangqiang
|
9faf244e40
|
【归元修改】 神将 法宝 归元修改
|
2021-03-30 16:36:00 +08:00 |
wangzhenxing
|
2e886d4524
|
【战斗】====清除盾效果添加破盾提示文字,清除免疫,持续伤害,控制效果添加清除提示;被动278修改;被动添加排序;控制效果结束修改
|
2021-03-30 16:34:17 +08:00 |
ZhangBiao
|
ee778776a1
|
【福星高照】提交
|
2021-03-30 16:24:28 +08:00 |
jiaoyangna
|
a0552233ae
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-03-30 16:15:49 +08:00 |
zhangqiang
|
54dec77b6b
|
【英雄升级特效显示修改】
|
2021-03-30 15:01:49 +08:00 |
ZhangBiao
|
fd9fc05994
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 14:34:40 +08:00 |
ZhangBiao
|
289af5b209
|
【活动优化】青龙秘宝界面优化
|
2021-03-30 14:34:25 +08:00 |
jiaoyangna
|
b67066cc66
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 14:22:46 +08:00 |
jiaoyangna
|
1ecb48c233
|
修改限时召唤图片
|
2021-03-30 14:22:37 +08:00 |
zhangqiang
|
4d3bbe4cfd
|
【称号坐骑时装】大闹天宫修改
|
2021-03-30 14:13:16 +08:00 |
jiaoyangna
|
87e724d19d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2021-03-30 13:48:08 +08:00 |
jiaoyangna
|
ed1d9a2b1f
|
Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 13:46:49 +08:00 |
ZhangBiao
|
73981e7200
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 13:43:59 +08:00 |
ZhangBiao
|
a0fb7f5714
|
【天宫寻宝】按钮增加特效
|
2021-03-30 13:43:46 +08:00 |
zhangqiang
|
2122997c3d
|
【称号坐骑时装】修改
|
2021-03-30 11:38:20 +08:00 |
ZhangBiao
|
d156471087
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 11:25:21 +08:00 |
ZhangBiao
|
32146997e4
|
【寻宝优化】优化天宫寻宝界面
|
2021-03-30 11:25:07 +08:00 |
wangzhenxing
|
27e4ab6e1a
|
[战斗]============= 获取数组的长度方法修改
|
2021-03-30 11:08:55 +08:00 |
jiaoyangna
|
4e83f9a540
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-30 10:50:57 +08:00 |
jiaoyangna
|
ae51b547d5
|
活动提交
|
2021-03-30 10:48:34 +08:00 |
zhangqiang
|
33b4da13b3
|
【英雄升级特效显示修改】
|
2021-03-30 10:38:59 +08:00 |
zhangqiang
|
fb57fc97d8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 10:28:12 +08:00 |
zhangqiang
|
25e351dba3
|
【称号坐骑时装】修改
|
2021-03-30 10:28:03 +08:00 |
ZhangBiao
|
8796bf4957
|
【福星高照】提交
|
2021-03-30 10:27:18 +08:00 |
JieLing
|
f81e8ecaab
|
Merge branch 'xma/dev' into master_xma_local
|
2021-03-29 23:34:12 +08:00 |
zhangqiang
|
dc5b4b107b
|
【抽卡灵兽】文字显示
|
2021-03-29 21:27:07 +08:00 |
jiaoyangna
|
eba43f84e2
|
删除log
|
2021-03-29 20:27:45 +08:00 |
jiaoyangna
|
02ee675843
|
每日豪礼修改提交
|
2021-03-29 20:20:02 +08:00 |
zhangqiang
|
76c9760993
|
Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
|
2021-03-29 17:56:19 +08:00 |
zhangqiang
|
db6f2d0b32
|
【称号坐骑时装】提交
|
2021-03-29 17:53:40 +08:00 |
gaoxin
|
3ecded4430
|
【假战斗优化】运营活动、充值活动相关的假战斗跳过改为直接解锁,而不需要等玩家到达30级
|
2021-03-29 17:11:25 +08:00 |
gaoxin
|
91e13dc314
|
【超值基金】月卡不开超值基金不显示
|
2021-03-29 16:52:23 +08:00 |
zhangqiang
|
cbdfb75576
|
【称号坐骑时装】提交
|
2021-03-29 16:45:04 +08:00 |
jiaoyangna
|
c16e912777
|
成长礼包,每日礼包修改提交
|
2021-03-29 15:16:32 +08:00 |
gaoxin
|
2a0ce862ae
|
【红点添加】限时兑换添加红点提示-关闭红点log
|
2021-03-29 14:54:13 +08:00 |
gaoxin
|
a599ef10f9
|
【红点添加】限时兑换添加红点提示
|
2021-03-29 14:37:15 +08:00 |
zhangqiang
|
51bb90edce
|
【称号坐骑时装】 协议 无尽副本修改
|
2021-03-29 12:07:28 +08:00 |
jiaoyangna
|
e7dff66a4f
|
品阶错误修改
|
2021-03-29 10:15:25 +08:00 |
ZhangBiao
|
e0d05e175e
|
【福星高照】提交
|
2021-03-29 09:52:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
afa1204341
|
【称号坐骑时装】三界降魔修改位置
|
2021-03-29 00:09:21 +07:00 |
gaoxin
|
5847735f79
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 20:03:26 +08:00 |
gaoxin
|
8c2a1c9a5b
|
【引导】引导GM添加
|
2021-03-31 20:03:21 +08:00 |
wangzhenxing
|
f497a63e73
|
[战斗]====================放逐添加表现
|
2021-03-27 20:22:14 +08:00 |
zhangqiang
|
9637337c39
|
【称号坐骑时装】 修改提交
|
2021-03-27 20:01:39 +08:00 |
jiaoyangna
|
c131b4e521
|
每日豪礼修改
(cherry picked from commit da3b21d024)
|
2021-03-27 19:26:59 +08:00 |
jiaoyangna
|
da3b21d024
|
每日豪礼修改
|
2021-03-27 19:25:04 +08:00 |
JieLing
|
06ccc3c6a0
|
Merge branch 'xma/dev' into master_xma_local
|
2021-03-27 17:46:18 +08:00 |
JieLing
|
4be640d489
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-27 17:45:06 +08:00 |
JieLing
|
5883b66fca
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-27 17:44:05 +08:00 |
JieLing
|
80b9b48367
|
【合并多余修改回滚】
|
2021-03-27 17:35:13 +08:00 |
JieLing
|
857d0112fa
|
Merge branch 'xma/dev' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-03-27 17:11:57 +08:00 |
gaoxin
|
0688f20ad6
|
【心魔试炼】排行榜有空格
|
2021-03-27 15:32:59 +08:00 |
gaoxin
|
fbfb02fc34
|
【聊天】公会消息缓存添加,暂时删除公会红包跑马灯
|
2021-03-27 14:58:57 +08:00 |
wangzhenxing
|
9101433578
|
【战斗】==============链接符显示修改,链接符放逐修改,灵兽无目标修改
|
2021-03-27 12:37:50 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
wangzhenxing
|
19d7914e78
|
【战斗】=======解决放逐目标有不灭不会被选中;解决只剩放逐目标攻击动画异常问题
|
2021-03-26 16:50:49 +08:00 |
gaoxin
|
feb1e97089
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-26 15:03:32 +08:00 |
zhangqiang
|
9786af645c
|
【本地化魂印】专属魂印适用范围不显示
|
2021-03-26 15:03:27 +08:00 |
wangzhenxing
|
19af51d38f
|
[战斗]========= 放逐后的buff刷新修改,放逐后的被动触发屏蔽,控制类buff 叠层逻辑修改
|
2021-03-26 14:40:23 +08:00 |
gaoxin
|
d48458f417
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-26 14:33:21 +08:00 |
gaoxin
|
a1778caa65
|
【公会红包】修复充值后报错扽问题
|
2021-03-26 14:33:12 +08:00 |
ZhangBiao
|
ad3b3c3e45
|
【牛气冲不动了】
|
2021-03-26 14:05:25 +08:00 |
ZhangBiao
|
dc187723c8
|
【牛气冲天】upview修改2
(cherry picked from commit 5d33070a00ca7b5c337522e0eb1b94cac304391e)
|
2021-03-26 14:00:30 +08:00 |
ZhangBiao
|
b7cff350f9
|
【牛气冲天】修改
|
2021-03-26 13:56:01 +08:00 |
ZhangBiao
|
3c31b5b5bd
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-26 13:49:56 +08:00 |
ZhangBiao
|
dc50f89214
|
【牛气冲天】upview提交
|
2021-03-26 13:49:41 +08:00 |
gaoxin
|
b18ad8487a
|
【战斗】casting层级调整,失败界面打开1秒后才能关闭
|
2021-03-26 12:15:48 +08:00 |
gaoxin
|
cb15f601b3
|
【聊天】去除登录之前的消息不显示的限制
|
2021-03-26 11:31:14 +08:00 |
gaoxin
|
1801a3d820
|
【十绝阵】排名数据超过20,滑动时显示错误的问题
|
2021-03-26 11:17:46 +08:00 |
ZhangBiao
|
b7c51cbf48
|
【牛气冲天】红点bug提交
(cherry picked from commit af8f9e0f409980ed6c85b205cb2c0503b4c9e301)
|
2021-03-25 16:33:33 +08:00 |
wangzhenxing
|
f5a85c4d2e
|
【战斗】===================== 灵兽释放技能逻辑修改, rolemanager 添加获取role接口
|
2021-03-25 15:54:12 +08:00 |
jiaoyangna
|
cfa67e8479
|
删除log
|
2021-03-25 15:34:57 +08:00 |
jiaoyangna
|
299a7ceff1
|
【天书秘卷】 修改
|
2021-03-25 15:34:05 +08:00 |
ZhangBiao
|
3b99759f6f
|
【牛气冲天】报空修复
(cherry picked from commit 756e920596af01046ab53a971423b77243a42678)
|
2021-03-25 15:20:19 +08:00 |
ZhangBiao
|
16853d09c3
|
【牛气冲天】物品特效、红点检测
(cherry picked from commit 11fb7cc1876c48ec26617da94405812861c4b4b1)
|
2021-03-25 15:02:13 +08:00 |
ZhangBiao
|
0a4d9a925b
|
【牛气冲天】主城报错提交
|
2021-03-25 11:35:25 +08:00 |
ZhangBiao
|
24fa8c17e2
|
Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-25 11:13:37 +08:00 |
ZhangBiao
|
304a175fc8
|
【牛气冲天】完成
|
2021-03-25 11:00:58 +08:00 |
jiaoyangna
|
4f188f1ef1
|
未进版本功能隐藏
|
2021-03-25 10:57:54 +08:00 |
jiaoyangna
|
646f3ae5de
|
新字不消失修改
|
2021-03-25 10:42:42 +08:00 |
ZhangBiao
|
5768d133f0
|
【牛气冲天】提交
|
2021-03-25 10:34:11 +08:00 |
ZhangBiao
|
3a5b35a399
|
【牛气冲天】提交
|
2021-03-25 09:58:36 +08:00 |
wangzhenxing
|
8f1d56cf8f
|
[战斗]==============灵兽每回合释放技能次数 刷新修改
|
2021-03-25 09:57:51 +08:00 |
gaoxin
|
17f0a9ed1e
|
【bug】零元礼包不再算做充值,修复第一天领取零元礼包,第二天充值会解锁第二天的首充礼包,但不能领取的问题。同时修复领取0元礼包也会导致自动弹出首充的问题。
|
2021-03-24 21:06:02 +08:00 |
zhangqiang
|
d00236d6d0
|
【称号 时装 坐骑】 协议数据提交
|
2021-03-24 21:05:31 +08:00 |
ZhangBiao
|
e8219c11b0
|
【牛气冲天】提交
|
2021-03-24 20:19:40 +08:00 |
jiaoyangna
|
f972b1646a
|
主题活动提交
|
2021-03-24 18:16:30 +08:00 |
jiaoyangna
|
b0887238d0
|
主题活动修改提交
|
2021-03-24 18:01:33 +08:00 |
ZhangBiao
|
481540080b
|
【牛气冲天】提交
|
2021-03-24 17:06:20 +08:00 |
wangzhenxing
|
21be2f29dd
|
[战斗]==============添加效果127 任务初始化时被动排序
|
2021-03-24 16:50:55 +08:00 |
zhangqiang
|
6f0593707f
|
【十绝阵个人排行】不显示玩家名字
|
2021-03-24 16:32:31 +08:00 |
zhangqiang
|
4939c4da92
|
【称号坐骑时装】部分资源提交
|
2021-03-24 16:31:14 +08:00 |
jiaoyangna
|
bf3ae927c8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-24 13:57:11 +08:00 |
jiaoyangna
|
e5e8c60c8b
|
主题活动
|
2021-03-24 13:57:08 +08:00 |
ZhangBiao
|
b63845938a
|
【牛气冲天】提交
|
2021-03-24 13:43:56 +08:00 |
zhangqiang
|
73e56f36bd
|
【首充】孙悟空页面详情天赋显示错误
|
2021-03-24 11:14:40 +08:00 |
jiaoyangna
|
54586ae204
|
天书秘卷提交
|
2021-03-24 10:55:33 +08:00 |
zhangqiang
|
4bcf4f3586
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-24 10:55:29 +08:00 |
zhangqiang
|
d0da980a3f
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-24 10:37:22 +08:00 |
zhangqiang
|
4f840d9463
|
【神将没有升级材料依旧会出现小红点】
|
2021-03-24 10:36:24 +08:00 |
ZhangBiao
|
2c5159fc11
|
【五级图标显示】
|
2021-03-24 09:48:35 +08:00 |
wangzhenxing
|
57b3c1af9c
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-23 20:42:07 +08:00 |
wangzhenxing
|
d0a7ef39ca
|
【战斗】=============添加新灵兽技能逻辑 放逐和麒麟印记
|
2021-03-23 20:41:44 +08:00 |
jiaoyangna
|
a6e553e5aa
|
灵兽提交
(cherry picked from commit 3bd78655a2)
|
2021-03-23 20:36:31 +08:00 |
jiaoyangna
|
3bd78655a2
|
灵兽提交
|
2021-03-23 20:33:21 +08:00 |
ZhangBiao
|
c9670aae58
|
【五级前不显示任何活动】
|
2021-03-23 20:28:31 +08:00 |
gaoxin
|
2d407b0dae
|
【百宝斋】竞技场赛季过渡以后,去百宝斋里点击下方大页签可以正常进入逐胜商店并购买,但是切换 逐胜/公会,这种小页签 就提示赛季已结束不让进
|
2021-03-23 18:10:59 +08:00 |
gaoxin
|
689d19776c
|
【bug】修复升级神将立即关闭界面,再次打开界面时显示错误
|
2021-03-23 18:08:22 +08:00 |
gaoxin
|
cf6fc198bb
|
【养成】升级时,战力光效层级不正确
|
2021-03-23 17:59:12 +08:00 |
gaoxin
|
8644d27aaa
|
【界面优化】部分界面显示优化修改
|
2021-03-23 17:26:16 +08:00 |
jiaoyangna
|
1f036b6793
|
添加头像置灰
|
2021-03-23 17:20:48 +08:00 |
jiaoyangna
|
fbed4d34ff
|
解锁条件修改
|
2021-03-23 17:10:04 +08:00 |
jiaoyangna
|
298946dd2d
|
Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-03-23 16:54:46 +08:00 |
jiaoyangna
|
44806a302d
|
红点提交
|
2021-03-23 16:52:19 +08:00 |
ZhangBiao
|
aa855b5fdd
|
【关卡】应该改成按钮
(cherry picked from commit f30186c57e)
|
2021-03-23 16:37:40 +08:00 |
gaoxin
|
c5d1dab173
|
【养成】升级时,战力光效层级不正确
|
2021-03-23 16:34:19 +08:00 |
zhangqiang
|
3618464a15
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-23 16:22:57 +08:00 |