wangzhenxing
|
1f37ce3b4e
|
【战斗】========被动438修改
|
2022-04-26 11:14:49 +08:00 |
yuanshuai
|
92e56472de
|
天宫商店点击报错 bug修改
|
2022-04-26 10:14:52 +08:00 |
wangzhenxing
|
d3a8722b95
|
图鉴修改
|
2022-04-25 20:35:17 +08:00 |
wangzhenxing
|
139a2de8d2
|
背包描述修改
|
2022-04-25 20:06:16 +08:00 |
wangzhenxing
|
adef176142
|
[战斗]======被动304修改
|
2022-04-25 20:03:44 +08:00 |
yuanshuai
|
868eb69aa6
|
挑战副本bug修改
|
2022-04-25 19:33:11 +08:00 |
yuanshuai
|
fd6f30e459
|
挑战副本bug修改
|
2022-04-25 18:56:48 +08:00 |
yuanshuai
|
626a2a98ef
|
化身bug修改
|
2022-04-25 18:48:27 +08:00 |
yuanshuai
|
565d4007df
|
化身之力界面调整
|
2022-04-25 18:42:19 +08:00 |
yuanshuai
|
55833325bf
|
跨服相关修改
|
2022-04-25 17:57:31 +08:00 |
yuanshuai
|
21342783bd
|
化身卡界面修改
|
2022-04-25 16:23:41 +08:00 |
yuanshuai
|
7c543952e5
|
身外化身界面修改
|
2022-04-25 15:52:46 +08:00 |
yuanshuai
|
4e5ccff820
|
身外化身界面调整
|
2022-04-25 14:42:17 +08:00 |
wangzhenxing
|
7de86a79eb
|
Merge branch 'china/dev' into china/test
|
2022-04-25 13:51:38 +08:00 |
wangzhenxing
|
e0263ea164
|
添加神印笔跳转
|
2022-04-25 13:43:46 +08:00 |
yuanshuai
|
dcf1e29c3a
|
界面优化
|
2022-04-25 11:52:09 +08:00 |
wangzhenxing
|
4b9d210499
|
屏蔽神阵营,屏蔽招募
|
2022-04-25 11:31:32 +08:00 |
yuanshuai
|
160d974cbc
|
变身卡界面调整提交
|
2022-04-24 22:13:28 +08:00 |
wangzhenxing
|
aad7541dbd
|
挑战副本不显示倒计时
|
2022-04-24 21:31:49 +08:00 |
yuanshuai
|
9ec3724c5d
|
身外化身界面调整
|
2022-04-24 20:27:05 +08:00 |
yuanshuai
|
882f77e164
|
界面修改
|
2022-04-24 19:46:59 +08:00 |
wangzhenxing
|
4792186f71
|
天书密卷屏蔽 装备篇
|
2022-04-24 18:32:44 +08:00 |
wangzhenxing
|
4fb96bca23
|
结算界面特效穿透问题修改
|
2022-04-24 18:27:53 +08:00 |
wangzhenxing
|
043f174f08
|
神印开始条件显示
|
2022-04-24 17:19:34 +08:00 |
yuanshuai
|
26970aee68
|
身外化身功能提交
|
2022-04-24 16:50:24 +08:00 |
wangzhenxing
|
e498661919
|
神印添加背包分解
|
2022-04-24 16:36:27 +08:00 |
wangzhenxing
|
7cdf302e90
|
神印修改提交
|
2022-04-24 14:20:11 +08:00 |
wangzhenxing
|
fed9afed62
|
[战斗]======目标选择逻辑添加空判断
|
2022-04-24 11:38:41 +08:00 |
yuanshuai
|
1114c62c97
|
添加一键放入
|
2022-04-22 19:29:10 +08:00 |
yuanshuai
|
765134f4b3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
|
2022-04-22 18:33:04 +08:00 |
yuanshuai
|
c3919b7e82
|
变身卡强化相关代码提交
|
2022-04-22 18:24:33 +08:00 |
wangzhenxing
|
ca2b699259
|
神印提交
|
2022-04-22 18:23:01 +08:00 |
wangzhenxing
|
e025824de6
|
添加报错处理
|
2022-04-22 13:17:58 +08:00 |
yuanshuai
|
d247989586
|
挑战副本bug修改
|
2022-04-21 18:43:24 +08:00 |
wangzhenxing
|
61a52f4239
|
[变身卡]=======处理变身卡报错
|
2022-04-21 17:23:57 +08:00 |
yuanshuai
|
dc8704a806
|
探索商店跳转入口添加
|
2022-04-28 10:48:08 +08:00 |
yuanshuai
|
bf52645eb7
|
挑战副本优化
|
2022-04-25 18:20:53 +08:00 |
yuanshuai
|
5217d75b41
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-20 13:23:25 +08:00 |
yuanshuai
|
50683260c7
|
挑战副本红点提交
|
2022-04-20 13:23:08 +08:00 |
wangzhenxing
|
ba45227ed1
|
[战斗]======去掉log
|
2022-04-20 13:22:26 +08:00 |
wangzhenxing
|
0cad07009a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-19 17:24:53 +08:00 |
wangzhenxing
|
53e7c44e2a
|
[战斗]=======战斗提交
|
2022-04-19 17:23:37 +08:00 |
yuanshuai
|
804b2c3f4d
|
挑战副本bug修改
|
2022-04-19 16:50:03 +08:00 |
yuanshuai
|
3c72cd688b
|
挑战副本bug修改
|
2022-04-19 16:14:55 +08:00 |
yuanshuai
|
24bf6c63e4
|
挑战副本脚本修改
|
2022-04-19 15:52:50 +08:00 |
yuanshuai
|
b907383826
|
挑战副本脚本修改
|
2022-04-19 11:53:08 +08:00 |
yuanshuai
|
b4a626d9e2
|
挑战副本脚本修改提交
|
2022-04-18 18:48:06 +08:00 |
yuanshuai
|
f8f14d06e9
|
挑战副本修改
|
2022-04-18 00:03:41 +08:00 |
yuanshuai
|
bd3bed7e41
|
挑战副本脚本提交
|
2022-04-15 11:48:52 +08:00 |
yuanshuai
|
9ebdab46b3
|
挑战副本相关脚本提交
|
2022-04-14 16:07:45 +08:00 |
yuanshuai
|
d39933b48d
|
红点提交
|
2022-05-18 20:06:18 +08:00 |
wangzhenxing
|
d4a6bfdda2
|
【神将排版优化】========神将信息界面修改
|
2022-05-18 20:00:57 +08:00 |
yuanshuai
|
9c9018b1da
|
终身卡功能提交
|
2022-05-18 19:39:19 +08:00 |
wangzhenxing
|
4a4ea1c784
|
【排行榜】=======关卡排行改山河设计图星星排行报错修改
|
2022-05-18 14:52:58 +08:00 |
wangzhenxing
|
8eec6cb793
|
【关卡排行】=====关卡界面关卡排行榜修改
|
2022-05-18 13:48:03 +08:00 |
yuanshuai
|
c9dfe177e6
|
百抽派送活动提交
|
2022-05-17 13:23:15 +08:00 |
wangzhenxing
|
ac6e551a1f
|
【车迟斗法】=====入口提示修改
|
2022-05-17 10:35:54 +08:00 |
wangzhenxing
|
b31dae947c
|
【抽卡】========抽卡提示
|
2022-05-16 18:20:17 +08:00 |
wangzhenxing
|
46499a8401
|
【车迟斗法】=======屏蔽车迟斗法开服七天后才能进入
|
2022-05-16 16:09:21 +08:00 |
wangzhenxing
|
09f2f05214
|
【战斗】=====如果之前是3倍速,就转成二倍速
|
2022-05-16 13:40:53 +08:00 |
wangzhenxing
|
e337559c30
|
【战斗】=======屏蔽战斗三倍数,2倍速改为2.5倍速
|
2022-05-16 13:23:16 +08:00 |
wangzhenxing
|
a7d570255b
|
【跳过】================战斗跳过功能提示修改
|
2022-05-16 13:03:54 +08:00 |
wangzhenxing
|
2ed317bc2c
|
摘星阁修改,备战阵营图标显示修改
|
2022-04-07 15:09:04 +08:00 |
wangzhenxing
|
5afe0f400b
|
洞府装备加成显示修改
|
2022-04-07 11:45:51 +08:00 |
wangzhenxing
|
abd83b945a
|
【bug】======英雄升星属性显示修改
|
2022-04-07 10:33:55 +08:00 |
wangzhenxing
|
9d772eab4c
|
【bug】=====心魔助战英雄修改
|
2022-04-06 16:21:34 +08:00 |
wangzhenxing
|
50c78ef888
|
【bug】======转换职业后卸下魂宝
|
2022-04-06 14:15:36 +08:00 |
wangzhenxing
|
e0ec7f2dec
|
[bug]====英雄信息修改
|
2022-04-02 17:47:30 +08:00 |
wangzhenxing
|
0a52e4a549
|
[bug]=====神系英雄修改提交
|
2022-04-02 16:03:18 +08:00 |
jiaoyangna
|
17f855be9f
|
【ID1011382】
进阶好礼
|
2022-04-02 15:43:29 +08:00 |
jiaoyangna
|
bfdc6d72b9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-02 14:45:36 +08:00 |
jiaoyangna
|
7a1ccac3cd
|
【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
|
2022-04-02 14:45:12 +08:00 |
wangzhenxing
|
3c1986c71c
|
【神魂】=====神魂升级屏蔽神系转换职业的英雄
|
2022-04-01 18:41:10 +08:00 |
wangzhenxing
|
9a2f342ef7
|
【功能】======寻仙招募优化
|
2022-04-01 17:10:37 +08:00 |
wangzhenxing
|
e9219317e2
|
【bug】=====森罗幻境修改
|
2022-04-01 16:01:36 +08:00 |
wangzhenxing
|
f44f70085b
|
【bug】=====七界阵容条件修改
|
2022-04-01 15:09:57 +08:00 |
wangzhenxing
|
a3e166a05e
|
【bug】=====英雄列表排序修改
|
2022-03-31 18:11:08 +08:00 |
wangzhenxing
|
88d80be02b
|
【bug】============神系转换职业修改
|
2022-03-31 17:25:43 +08:00 |
wangzhenxing
|
6d7dcce74f
|
[bug]======无尽副本编对界面修改
|
2022-03-31 16:00:27 +08:00 |
wangzhenxing
|
764f61cfb2
|
[bug]=====飞升界面英雄临时数据修改
|
2022-03-31 14:29:25 +08:00 |
wangzhenxing
|
eff2800c35
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-31 09:51:26 +08:00 |
wangzhenxing
|
3e625b9fd0
|
[功能]=======英雄合成,英雄置换修改提交
|
2022-03-31 09:51:10 +08:00 |
wangzhenxing
|
24a92b6b98
|
[战斗]=======被动387修改
|
2022-03-30 17:12:03 +08:00 |
jiaoyangna
|
4252fde78f
|
【ID1011380】
装备和宝石属性修正
(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae)
|
2022-03-30 13:40:37 +08:00 |
zhangshanxue
|
810fd2cacb
|
Merge branch 'china/dev' into china/test
|
2022-03-29 17:04:16 +08:00 |
jiaoyangna
|
82dd52e57c
|
红点修改提交
|
2022-03-29 16:41:19 +08:00 |
jiaoyangna
|
f1bcffd06f
|
红点修改提交
|
2022-03-29 16:31:20 +08:00 |
jiaoyangna
|
701938ad27
|
【ID1011391】
飞升鸿蒙阵等级限制调整
(cherry picked from commit 0f69eb822293597556fe825a6b9f99d27b8d8f91)
|
2022-03-29 16:25:49 +08:00 |
wangzhenxing
|
9f2b6a80b5
|
[功能]=======命石显示修改
|
2022-03-29 15:49:54 +08:00 |
wangzhenxing
|
57812ad22f
|
[功能]=======命石修改,建木神树修改
|
2022-03-29 15:28:56 +08:00 |
jiaoyangna
|
bbde58e666
|
【ID1011387】
战力冲刺有奖励可领取时增加红点提示
(cherry picked from commit d2773bab9e7c632f68f26b3829eb495296654761)
|
2022-03-29 14:03:42 +08:00 |
wangzhenxing
|
24475514b9
|
【bug】======命石属性描述修改
|
2022-03-29 13:39:05 +08:00 |
wangzhenxing
|
3e9ed638b4
|
[bug]=====命石描述修改,车迟开启提示修改
|
2022-03-29 11:54:41 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
wangzhenxing
|
91ace072a2
|
[功能]=====车迟斗法开服7日后开启
|
2022-03-28 15:29:10 +08:00 |
zhangshanxue
|
a6fa8cdc4b
|
Merge branch 'china/dev' into china/test
|
2022-03-28 11:06:34 +08:00 |
wangzhenxing
|
c593cdf2d6
|
[bug]======寻宝特效穿透修改
|
2022-03-25 14:12:19 +08:00 |
jiaoyangna
|
ef74528bc7
|
对充值活动进行关闭
|
2022-03-23 16:23:31 +08:00 |
jiaoyangna
|
c66ce27a88
|
主城特效修改提交
|
2022-03-22 15:43:16 +08:00 |
wangzhenxing
|
eceb6abcdc
|
[探索]=========屏蔽功能入口
|
2022-03-22 14:01:59 +08:00 |
jiaoyangna
|
40630efdb4
|
山河试炼倒计时修改提交
|
2022-03-22 13:45:34 +08:00 |
jiaoyangna
|
54faa0a971
|
山河试炼活动报错修改
|
2022-03-22 13:38:59 +08:00 |
jiaoyangna
|
2c9e94dcc9
|
牛气冲天任务修改提交
|
2022-03-22 11:57:50 +08:00 |
jiaoyangna
|
5348a49256
|
Revert "冲突提交"
This reverts commit b5a29c9152 .
|
2022-03-22 11:06:54 +08:00 |
jiaoyangna
|
1ab08284a4
|
牛气冲天任务状态修改提交
|
2022-03-22 11:06:03 +08:00 |
jiaoyangna
|
c93b9e3f04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-21 18:29:21 +08:00 |
jiaoyangna
|
b5a29c9152
|
冲突提交
|
2022-03-21 18:29:03 +08:00 |
wangzhenxing
|
e936ce29ce
|
[战斗]======选择英雄添加新判断
|
2022-03-21 18:23:54 +08:00 |
wangzhenxing
|
4562629709
|
[功能]==============修行技能添加战斗力提交
|
2022-03-21 17:46:30 +08:00 |
jiaoyangna
|
b57a82309b
|
山河试炼修改提交
|
2022-03-21 17:21:11 +08:00 |
jiaoyangna
|
31afc70951
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-21 11:04:38 +08:00 |
jiaoyangna
|
096845f8ad
|
【ID1011356】
山河试炼添加引导
|
2022-03-21 11:04:08 +08:00 |
wangzhenxing
|
3529402f5e
|
[战斗]=========被动431修改
|
2022-03-21 10:22:12 +08:00 |
wangzhenxing
|
3e5b67ddf6
|
【技能】=========149 150 修改提交
|
2022-03-18 16:29:03 +08:00 |
wangzhenxing
|
9e010245fe
|
[战斗]========技能149 被动429 430 431修改提交
|
2022-03-18 15:47:16 +08:00 |
jiaoyangna
|
18803bfc29
|
东海寻仙提交
|
2022-03-18 13:25:09 +08:00 |
wangzhenxing
|
01b3a8c35b
|
【战斗】=======护盾效果表现修改
|
2022-03-17 16:50:40 +08:00 |
wangzhenxing
|
0f2eebfe42
|
[战斗]===================被动433修改 技能添加148
|
2022-03-17 16:15:34 +08:00 |
jiaoyangna
|
31b1721510
|
探索提交
|
2022-03-17 15:21:08 +08:00 |
wangzhenxing
|
a82de03880
|
[战斗]=======被动431 -434修改提交
|
2022-03-17 10:12:35 +08:00 |
gaoxin
|
61ce0ea1bc
|
【四灵试炼】修复选择四灵中佩戴唯一性的魂印的助战神将,会导致自己无法佩戴的问题
|
2022-03-15 18:23:52 +08:00 |
gaoxin
|
81f76cc4dc
|
【限时折扣】主界面按钮资源修改添加特效
|
2022-03-15 13:37:13 +08:00 |
wangzhenxing
|
008b3671c4
|
[战斗]======buff提示文字修改
|
2022-03-14 17:10:15 +08:00 |
wangzhenxing
|
eff4c32f68
|
[战斗]========被动431修改
|
2022-03-14 14:06:12 +08:00 |
gaoxin
|
e97ab8fa84
|
【跳转】锻器阁页签顺序修改导致判断错误
|
2022-03-11 17:34:15 +08:00 |
gaoxin
|
52bdc56af4
|
【锻器阁】调整魂印和宝物的顺序
|
2022-03-11 16:57:04 +08:00 |
gaoxin
|
d48d420dd2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-11 16:36:58 +08:00 |
gaoxin
|
de178b9875
|
【锻器阁】未解锁的功能显示未解锁提示
|
2022-03-11 16:36:47 +08:00 |
wangzhenxing
|
8e05053512
|
【战斗】=========被动429 430 431添加提交
|
2022-03-11 16:30:38 +08:00 |
jiaoyangna
|
81ca63fc7e
|
车迟积分修改提交
|
2022-03-10 18:20:35 +08:00 |
jiaoyangna
|
1e39c04f7d
|
车迟结算界面积分修改提交
|
2022-03-10 18:17:44 +08:00 |
jiaoyangna
|
18e5994279
|
车迟斗法提交
|
2022-03-10 18:08:45 +08:00 |
jiaoyangna
|
5be4e726ea
|
挂机收益显示错误修改
|
2022-03-10 17:04:37 +08:00 |
jiaoyangna
|
9de941b911
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-10 13:45:32 +08:00 |
jiaoyangna
|
e5dde41cda
|
【ID1011337】
【优化】车迟斗法抢夺目标 ,玩家积分显示
【ID1011218】
天书秘卷功能图标位置调整
|
2022-03-10 13:45:12 +08:00 |
张彪
|
2ea7d31c8b
|
【张彪】交接文档
|
2022-03-09 17:01:10 +08:00 |
张彪
|
b120f5ccd5
|
【主城】修改右侧条状态
|
2022-03-08 14:05:24 +08:00 |
jiaoyangna
|
0b42597919
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-07 17:28:00 +08:00 |
jiaoyangna
|
0c8af1e9b5
|
天地洪炉修改提交
|
2022-03-07 17:27:42 +08:00 |
张彪
|
3ffdee3acb
|
【战力冲刺】提交
|
2022-03-07 16:10:46 +08:00 |
张彪
|
22514fe5f7
|
【战力冲刺】调整
|
2022-03-07 16:05:38 +08:00 |
张彪
|
98443bbdb2
|
Revert "【战力冲刺】领取功能调整"
This reverts commit 5a5bc3237b .
|
2022-03-07 14:30:31 +08:00 |
张彪
|
5f7cb1b4df
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-07 13:18:21 +08:00 |
张彪
|
5a5bc3237b
|
【战力冲刺】领取功能调整
|
2022-03-07 13:18:14 +08:00 |
jiaoyangna
|
bc01045eae
|
山河试炼奖励显示错误修改
|
2022-03-07 10:21:56 +08:00 |
jiaoyangna
|
d6a67e89f2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-07 10:13:08 +08:00 |
jiaoyangna
|
a2fd8dcaea
|
山河试炼奖励显示错误修改提交
|
2022-03-07 10:12:51 +08:00 |
gaoxin
|
1d3ef22dac
|
【玩家信息】兼容以前
|
2022-03-04 18:26:36 +08:00 |
gaoxin
|
51b829874d
|
【角色信息】所有跨服查看信息的不再可以添加好友和黑名单,修复跨服信息显示错误
|
2022-03-04 18:13:16 +08:00 |
gaoxin
|
b10ebcd3ba
|
【车迟斗法】抢夺界面添加跨服显示
|
2022-03-04 17:48:27 +08:00 |
gaoxin
|
8768ee20a2
|
【牛气冲天】活动界面牛详细信息展示属性
|
2022-03-04 17:29:09 +08:00 |
wangzhenxing
|
586b77af34
|
[战斗]======被动427修改提交
|
2022-03-04 16:25:34 +08:00 |
张彪
|
1e5ac04921
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-03 17:37:40 +08:00 |
张彪
|
d62388966b
|
【车迟斗法】抢夺记录玩家信息
|
2022-03-03 17:37:34 +08:00 |
wangzhenxing
|
361c08b5b1
|
[战斗]======被动428修改
|
2022-03-03 17:08:01 +08:00 |
wangzhenxing
|
ba38abcdaf
|
【战斗】=========被动428提交
|
2022-03-03 16:56:33 +08:00 |
张彪
|
4d97370a24
|
【车迟斗法】跨服
|
2022-03-03 16:52:08 +08:00 |
张彪
|
f0f205ca9e
|
【车迟斗法提交】
|
2022-03-03 15:14:42 +08:00 |
张彪
|
0b75ce4df4
|
【车迟斗法】提交
|
2022-03-03 14:39:24 +08:00 |
wangzhenxing
|
45661cf346
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-03 13:39:41 +08:00 |
wangzhenxing
|
e9f73fb70e
|
【战斗】======被动427提交
|
2022-03-03 13:36:32 +08:00 |
张彪
|
5a416c5149
|
【车迟斗法】工会界面倒计时
|
2022-03-03 13:30:25 +08:00 |
jiaoyangna
|
5dc08c93ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 18:33:01 +08:00 |
jiaoyangna
|
babc4d671b
|
【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
|
2022-03-02 18:32:34 +08:00 |
张彪
|
dfe2c0ca66
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 18:26:28 +08:00 |
张彪
|
5a43fbdda0
|
【易经宝库】提交
|
2022-03-02 18:26:20 +08:00 |
jiaoyangna
|
a01a70e9bb
|
红点提交
|
2022-03-02 18:09:49 +08:00 |
jiaoyangna
|
3b0871ad17
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 18:08:56 +08:00 |
张彪
|
b4232a2e46
|
【易经宝库】大奖删除兼容
|
2022-03-02 17:50:12 +08:00 |
jiaoyangna
|
6b4cf31c3c
|
【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
|
2022-03-02 17:48:52 +08:00 |
张彪
|
336e3b68fe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 16:10:13 +08:00 |
张彪
|
62d9d6da20
|
【易经宝库】最终大奖显示特效
|
2022-03-02 16:10:06 +08:00 |
jiaoyangna
|
cd220c0f35
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 15:06:30 +08:00 |
jiaoyangna
|
5fcee7571c
|
【ID1011199】
超值返利图标位置调整
|
2022-03-02 15:06:13 +08:00 |
张彪
|
684ed7ea0d
|
【装备】跳转到指定位置
|
2022-03-02 15:02:23 +08:00 |
张彪
|
40d2fc4659
|
【装备】跳转摘星阁
|
2022-03-02 14:40:13 +08:00 |
张彪
|
ef47e3dfb7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 14:15:20 +08:00 |
张彪
|
d33dcb9f97
|
【装备】装备添加快捷入口到摘星阁
|
2022-03-02 14:15:13 +08:00 |
wangzhenxing
|
a27d510730
|
【被动】===========339修改
|
2022-03-02 14:07:52 +08:00 |
jiaoyangna
|
74b385e4a1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 13:43:36 +08:00 |
jiaoyangna
|
e191704a54
|
【ID1011199】
超值返利图标位置调整
|
2022-03-02 13:42:58 +08:00 |
张彪
|
ee77648eb1
|
【寻仙招募】奖励预览报错
|
2022-03-02 13:39:40 +08:00 |
gaoxin
|
be34fccc5c
|
【至尊降世】修复领取前三个奖励后入口消失的问题
|
2022-03-01 18:35:16 +08:00 |
张彪
|
6f5aad16b3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-24 18:19:50 +08:00 |
张彪
|
1ae90cb549
|
【战力冲刺】修改提交
|
2022-02-24 18:19:39 +08:00 |
wangzhenxing
|
e83b649e34
|
【战斗】=======新增425 426被动
|
2022-02-24 15:57:12 +08:00 |
gaoxin
|
0ce89251f8
|
【选择神将】报错修复
|
2022-02-24 02:56:42 +08:00 |
gaoxin
|
cbc4f3f410
|
【建木神树】修复神树升级后战斗计算异常
|
2022-02-24 02:22:16 +08:00 |
gaoxin
|
43133199cf
|
【云梦豪礼】修复奖励无法领取的问题
|
2022-02-24 00:20:58 +08:00 |
jiaoyangna
|
cadc9337da
|
删除log
|
2022-02-23 18:34:10 +08:00 |
jiaoyangna
|
88a67b0cbf
|
至尊降世修改提交
|
2022-02-23 18:33:40 +08:00 |
jiaoyangna
|
57198fce39
|
至尊降世兼容提交
|
2022-02-23 18:12:22 +08:00 |
jiaoyangna
|
6abf049eb7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-23 17:24:49 +08:00 |
jiaoyangna
|
d0720e17b2
|
【ID1011178】
至尊降世活动拉到1000档
|
2022-02-23 17:24:34 +08:00 |
wangzhenxing
|
255603a71a
|
[战斗]==========被动375修改
|
2022-02-23 14:36:31 +08:00 |
gaoxin
|
30e7ef5bd5
|
【无尽副本】加入神将版本控制判断
|
2022-02-22 14:20:02 +08:00 |
jiaoyangna
|
3cecd32fda
|
【ID1019545】
【公会技能】长按升级至道具不足,继续长按显示升级成功
|
2022-02-22 11:04:41 +08:00 |
jiaoyangna
|
1905b3c175
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-21 18:37:18 +08:00 |
jiaoyangna
|
3ccf3c29a3
|
ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-21 18:36:21 +08:00 |
wangzhenxing
|
51e89fea29
|
英雄觉醒后天赋显示修改
|
2022-02-21 14:25:52 +08:00 |
gaoxin
|
096d0d0dc4
|
【无尽副本】编队列表加入神将版本判断
|
2022-03-02 13:42:48 +08:00 |
gaoxin
|
84f21cbd9b
|
【推荐阵容】加入神将版本判断
|
2022-03-02 13:28:07 +08:00 |
张彪
|
9345c31d8b
|
【战力冲刺】提交
|
2022-02-21 10:40:27 +08:00 |
张彪
|
b51c7b7780
|
【战力冲刺】提交
|
2022-02-18 17:02:27 +08:00 |
张彪
|
05b9c3afa5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 16:28:02 +08:00 |
张彪
|
4ca27d13ad
|
【战力冲刺】提交
|
2022-02-18 16:27:49 +08:00 |
wangzhenxing
|
92f3dee3ab
|
【战斗】==========被动226 423 424修改添加提交
|
2022-02-18 16:26:33 +08:00 |
jiaoyangna
|
70cc76deb4
|
恭送神将排序修改提交
|
2022-02-18 15:32:42 +08:00 |
jiaoyangna
|
fbb86f7263
|
恭送神将排序修改提交
|
2022-02-18 15:31:50 +08:00 |
jiaoyangna
|
bfd2ff46a7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 15:18:09 +08:00 |
jiaoyangna
|
2986b3964a
|
魂印图鉴修改提交
|
2022-02-18 15:17:28 +08:00 |
张彪
|
3aa934a95e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 15:14:33 +08:00 |
张彪
|
51196cf150
|
【灵兽宝阁】新增几档灵兽特惠礼包界面提交
|
2022-02-18 15:14:25 +08:00 |
jiaoyangna
|
42a60c158f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 15:09:25 +08:00 |
jiaoyangna
|
1bd0fe5562
|
魂印修改提交
|
2022-02-18 15:08:45 +08:00 |
张彪
|
7083b34f51
|
【战力冲刺】提交
|
2022-02-18 14:05:59 +08:00 |
张彪
|
f9fca9ca93
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-17 17:14:46 +08:00 |
张彪
|
a6d0a4f7f0
|
【战力冲刺】提交
|
2022-02-17 17:14:33 +08:00 |
张彪
|
14af727eab
|
【战力冲刺】提交
|
2022-02-17 16:27:36 +08:00 |
jiaoyangna
|
a76616df31
|
【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 15:13:26 +08:00 |
gaoxin
|
0933331d4a
|
【神将】加入版本控制时间计算错误修改
|
2022-02-24 16:50:36 +08:00 |
gaoxin
|
bfbc3b7195
|
【拍脸】寻仙招募界面显示错误修改
|
2022-02-24 16:49:19 +08:00 |
gaoxin
|
545e06c474
|
Merge branch '0功能/寻仙招募拍脸' into china/dev
|
2022-02-24 15:57:18 +08:00 |
gaoxin
|
63343f88c7
|
【拍脸】寻仙招募拍脸跳转添加引导小手
|
2022-02-24 15:56:53 +08:00 |
gaoxin
|
2342bd8af8
|
【拍脸】寻仙招募拍脸添加
|
2022-02-23 18:08:50 +08:00 |
wangzhenxing
|
5b3c82f0b3
|
【bug】=======图鉴觉醒信息显示修改
|
2022-02-15 10:43:13 +08:00 |
jiaoyangna
|
4ea5d98b31
|
每日豪礼修改提交
|
2022-02-15 10:36:08 +08:00 |
gaoxin
|
f9f34a9d46
|
【天书密卷】加入神将是否进入版本判断
|
2022-02-11 17:07:07 +08:00 |
wangzhenxing
|
3fde93fcd7
|
【战斗】=========效果108修改
|
2022-02-11 16:27:27 +08:00 |
gaoxin
|
c2b4647418
|
【限时Up】加入神将版本判断
|
2022-02-11 16:22:44 +08:00 |
gaoxin
|
0ec5cf102a
|
【心愿】判断神将是否加入版本
|
2022-02-11 16:11:58 +08:00 |
gaoxin
|
2b413264fd
|
【头像】加入英雄是否进入版本判断-删除log
|
2022-02-11 16:06:38 +08:00 |
gaoxin
|
a2ee17f6c3
|
【头像】加入英雄是否进入版本判断
|
2022-02-11 16:05:51 +08:00 |
jiaoyangna
|
7a010e5e7d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:58:16 +08:00 |
jiaoyangna
|
e27c51ee93
|
超值返利提交
|
2022-02-11 15:57:58 +08:00 |
张彪
|
e82c6693e5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:54:11 +08:00 |
张彪
|
d56afde090
|
【每日特惠】注释代码
|
2022-02-11 15:54:03 +08:00 |
wangzhenxing
|
a645a1f8d7
|
【战斗】=======斩杀方法添加空判断
|
2022-02-11 15:44:36 +08:00 |
jiaoyangna
|
81660bd819
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:30:05 +08:00 |
jiaoyangna
|
caa434c726
|
【ID1011130】
【活动优化】超值返利
|
2022-02-11 15:18:20 +08:00 |
gaoxin
|
b6fa8db0cc
|
【图鉴】加入版本判断
|
2022-02-11 15:11:38 +08:00 |
jiaoyangna
|
a17a8604d9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:10:05 +08:00 |
jiaoyangna
|
98a095ee46
|
【活动优化】超值返利
|
2022-02-11 15:09:32 +08:00 |
gaoxin
|
320d755e02
|
【神将自选箱】加入英雄版本判断
|
2022-02-11 14:57:01 +08:00 |
jiaoyangna
|
072edac018
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 11:26:51 +08:00 |
jiaoyangna
|
7e62f47ca8
|
【ID1011130】
【活动优化】超值返利
|
2022-02-11 11:26:34 +08:00 |
gaoxin
|
18967c9ae2
|
【专属升星】误提交还原
|
2022-02-11 11:18:37 +08:00 |
张彪
|
9ba115e464
|
【每日特惠修改】
|
2022-02-11 10:35:42 +08:00 |
张彪
|
6391c6ea97
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 18:23:24 +08:00 |
张彪
|
0bc10a78c8
|
【每日特惠】优化
|
2022-02-10 18:22:48 +08:00 |
gaoxin
|
6f39aa9645
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 17:57:23 +08:00 |
gaoxin
|
244db76135
|
【四元阵】修改概率基数的计算方式
|
2022-02-10 17:57:18 +08:00 |
张彪
|
b868d5ff2f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 17:53:20 +08:00 |
张彪
|
4659ad0f84
|
【活动优化】每日特惠优化
|
2022-02-10 17:53:00 +08:00 |
wangzhenxing
|
01506ba48c
|
[角色天赋]======角色天赋显示修改
|
2022-02-10 17:52:40 +08:00 |
jiaoyangna
|
0cf058dbb5
|
每日豪礼
|
2022-02-10 17:10:35 +08:00 |
jiaoyangna
|
69997cef10
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 16:50:02 +08:00 |
jiaoyangna
|
bd5d09def0
|
【ID1011132】
【活动优化】每日豪礼
|
2022-02-10 16:49:21 +08:00 |
wangzhenxing
|
599ef2e0fc
|
[战斗]=========被动356 422 技能: 108修改
|
2022-02-10 15:29:24 +08:00 |
jiaoyangna
|
8d196f6759
|
天地洪炉心愿修改提交
|
2022-02-08 17:50:09 +08:00 |
张彪
|
7f6cb1a40f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-08 14:07:03 +08:00 |
张彪
|
e257033ea6
|
【天地洪炉】增加白金品质宝物碎片
|
2022-02-08 14:06:25 +08:00 |
gaoxin
|
62a9cda5d3
|
【战斗】修复姑获鸟神魂五对所有人生效的问题
|
2022-01-27 13:21:07 +08:00 |
gaoxin
|
1e26aad156
|
【逍遥游】数据打印添加
|
2022-01-26 16:01:45 +08:00 |
张彪
|
1f248db5f0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-26 13:40:20 +08:00 |
张彪
|
1597c0b657
|
【特权商城】无法购买最后i一个名望礼包,修改
|
2022-01-26 13:40:13 +08:00 |
wangzhenxing
|
4af86c7e7f
|
【战斗】=====御甲初始化数值修改
|
2022-01-26 13:29:39 +08:00 |
wangzhenxing
|
7d3e8fd73d
|
[紫府神印]======紫府神印报错修改
|
2022-01-26 10:29:59 +08:00 |
张彪
|
432c92dcf0
|
【超值基金】提交
|
2022-01-24 18:41:18 +08:00 |
张彪
|
017cd79c09
|
【超值基金】提交
|
2022-01-24 18:11:06 +08:00 |
张彪
|
e7b9c54c45
|
【超值基金】提交
|
2022-01-24 18:09:14 +08:00 |
张彪
|
8e85780697
|
【超值寂静】提交
|
2022-01-24 18:03:04 +08:00 |
张彪
|
92d47074a4
|
【超值基金】提交
|
2022-01-24 17:31:40 +08:00 |
张彪
|
d1bb3391ac
|
【超值基金】提交
|
2022-01-24 17:09:55 +08:00 |
wangzhenxing
|
9e73d667a2
|
[战斗]========加御甲显示修改
|
2022-01-24 16:20:07 +08:00 |
jiaoyangna
|
5eca555299
|
浮生门按钮层级修改提交
|
2022-01-24 16:07:21 +08:00 |
jiaoyangna
|
087e83bce7
|
【ID1019501】
【探索】进入地图后,小人显示有血,原地晃
|
2022-01-24 11:23:19 +08:00 |
jiaoyangna
|
775c0a54bc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-24 10:48:53 +08:00 |
jiaoyangna
|
dd2c4a8eb6
|
达人活动报错修改
|
2022-01-24 10:48:29 +08:00 |
wangzhenxing
|
0a51ced090
|
[飞升]=====大脑天宫特效修改
|
2022-01-22 17:08:17 +08:00 |
jiaoyangna
|
4bd7512ade
|
节日修改提交
|
2022-01-22 16:05:55 +08:00 |
jiaoyangna
|
9d755a2c1d
|
可以领取时点击事件修改
|
2022-01-22 15:54:30 +08:00 |
jiaoyangna
|
911ef94fb1
|
跨天红点刷新修改
|
2022-01-22 14:00:01 +08:00 |
jiaoyangna
|
ec7be4c020
|
节日提交
|
2022-01-22 13:27:25 +08:00 |
jiaoyangna
|
5cea36a143
|
节日修改提交
|
2022-01-22 11:37:59 +08:00 |
jiaoyangna
|
227e0f68c1
|
特效提交
|
2022-01-22 11:12:47 +08:00 |
ZhangBiao
|
6e10183d80
|
【命格】命石合成显示调整
|
2022-01-22 10:13:43 +08:00 |
jiaoyangna
|
3a9acbdf19
|
签到好礼提交
|
2022-01-21 18:49:40 +08:00 |
wangzhenxing
|
b18db8765d
|
[飞升]=====飞升特效修改提交
|
2022-01-21 17:09:14 +08:00 |
jiaoyangna
|
1f4c38a710
|
显示修改
|
2022-01-21 14:27:07 +08:00 |
jiaoyangna
|
937ca23dc0
|
探索提交
|
2022-01-21 14:06:30 +08:00 |
wangzhenxing
|
e5494e65ab
|
[飞升]=====图鉴显示修改
|
2022-01-21 13:55:17 +08:00 |
gaoxin
|
4c00b471ad
|
【战斗】添加头像显示
|
2022-01-21 11:59:19 +08:00 |
wangzhenxing
|
ecc7e155a0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 18:21:58 +08:00 |
jiaoyangna
|
a2b9a69126
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 18:19:04 +08:00 |
wangzhenxing
|
b64234bcb8
|
[飞升]=====特效修改提交
|
2022-01-20 18:18:40 +08:00 |
jiaoyangna
|
676f03e79f
|
众志成城提交
|
2022-01-20 18:18:24 +08:00 |
ZhangBiao
|
68c9886183
|
【家园】特权升级提示错误修改
|
2022-01-20 18:11:28 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
jiaoyangna
|
90c21e5a73
|
协议提交
|
2022-01-20 16:17:26 +08:00 |
jiaoyangna
|
039f212694
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 15:32:17 +08:00 |
wangzhenxing
|
46f337312e
|
[飞升]========特效修改
|
2022-01-20 15:06:04 +08:00 |
jiaoyangna
|
70d3d943a8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 11:42:25 +08:00 |
wangzhenxing
|
e734c4a03d
|
[飞升]=======飞升修改
|
2022-01-20 11:41:20 +08:00 |
jiaoyangna
|
1c24a85612
|
添加红点
|
2022-01-20 11:22:39 +08:00 |
wangzhenxing
|
9831008684
|
[飞升]======飞升特效适配
|
2022-01-19 18:34:35 +08:00 |
gaoxin
|
5a66722aed
|
【无尽副本】优化清除缓存第一次进入无尽副本时任务状态错误
|
2022-01-19 18:32:43 +08:00 |
wangzhenxing
|
7fd7ef19f3
|
[飞升]====卡牌背景修改
|
2022-01-19 17:50:39 +08:00 |
jiaoyangna
|
a797e80b39
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-19 17:47:28 +08:00 |
jiaoyangna
|
a544abe9cc
|
众志成城
|
2022-01-19 17:47:07 +08:00 |
wangzhenxing
|
6ef00a4498
|
[飞升]=====细节调整
|
2022-01-19 16:57:17 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
gaoxin
|
35648e8762
|
【升级】长按升到最大级了,会无法触发抬起事件,导致升级失败
|
2022-01-19 15:22:11 +08:00 |
gaoxin
|
155dabe7c7
|
【专属升星】选择神将界面打不开
|
2022-01-18 15:07:14 +08:00 |
jiaoyangna
|
b5cc0635ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 14:49:50 +08:00 |
jiaoyangna
|
ac24c2e0ce
|
【ID1010998】
【春节活动】签到领奖活动
|
2022-01-18 14:48:27 +08:00 |
ZhangBiao
|
54aeaa2ea8
|
【寻仙招募】提交
|
2022-01-18 12:09:43 +08:00 |
wangzhenxing
|
ff5866e00e
|
[法宝详情]=======添加返回按钮
|
2022-01-18 11:57:38 +08:00 |
wangzhenxing
|
4298209c33
|
[战斗]=======护盾buff修改
|
2022-01-18 11:44:36 +08:00 |
gaoxin
|
925db190ee
|
【引导】修复挂机界面打开时触发引导小手不消失的问题
|
2022-01-18 11:38:00 +08:00 |
ZhangBiao
|
558bbfdee1
|
【鸿蒙阵】报错提交
|
2022-01-18 11:20:55 +08:00 |
ZhangBiao
|
4d7c72725a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-18 10:57:09 +08:00 |
ZhangBiao
|
6283677b8f
|
【诸多修改】提交
|
2022-01-18 10:53:25 +08:00 |
wangzhenxing
|
7f9868ca59
|
[bug]=====奖池预览修改,图鉴详情添加点击反馈
|
2022-01-18 10:45:39 +08:00 |
ZhangBiao
|
b316eccd7c
|
【装备】摘星阁属性
|
2022-01-18 10:19:36 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
wangzhenxing
|
2e0bd1ded7
|
[飞升]=======显示修改
|
2022-01-18 09:47:38 +08:00 |
ZhangBiao
|
f20f722177
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 18:24:12 +08:00 |
ZhangBiao
|
bf3ca7ef08
|
【装备加持】鸿蒙阵共鸣出的装备未受到装备加持加成
|
2022-01-17 18:22:45 +08:00 |
wangzhenxing
|
1de7293630
|
[飞升]======卡牌飞升预设修改
|
2022-01-17 16:53:26 +08:00 |
wangzhenxing
|
d5fd95373f
|
[抽卡奖池]======抽卡奖池预览修改
|
2022-01-17 15:56:27 +08:00 |
wangzhenxing
|
ea10cd65d1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 14:26:54 +08:00 |
ZhangBiao
|
369f7aa1ef
|
【点将台】选择心愿神将,列表动画不正常
|
2022-01-17 14:26:17 +08:00 |
wangzhenxing
|
f257bc2c6d
|
[图鉴]=====图鉴神魂按钮显示修改
|
2022-01-17 14:26:17 +08:00 |
ZhangBiao
|
ae020064ab
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 14:10:19 +08:00 |
ZhangBiao
|
4e00c5e9c3
|
【名望礼包】红点
|
2022-01-17 14:10:08 +08:00 |
jiaoyangna
|
d0023bbcdf
|
神魂显示修改提交
|
2022-01-17 13:56:06 +08:00 |
jiaoyangna
|
7d0c4e21d0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:24:04 +08:00 |
jiaoyangna
|
5bd09017e0
|
掩藏神魂
|
2022-01-17 13:23:19 +08:00 |
ZhangBiao
|
e3196e3ca2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:16:30 +08:00 |
ZhangBiao
|
409836ffb5
|
【名望礼包】提交
|
2022-01-17 13:16:18 +08:00 |
jiaoyangna
|
a4cbd77a99
|
许愿神将修改提交
|
2022-01-17 11:23:22 +08:00 |
jiaoyangna
|
4c1b1dbc30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:19:23 +08:00 |
jiaoyangna
|
4abe2d4203
|
Revert "许愿神将修改提交"
This reverts commit fbd1c9aa43 .
|
2022-01-17 11:18:55 +08:00 |
gaoxin
|
58b5702a30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:06:41 +08:00 |
gaoxin
|
e99f1a2ca7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:02:48 +08:00 |
gaoxin
|
69e30f8fd0
|
【关卡】功能引导时关闭小手显示
|
2022-01-17 11:02:33 +08:00 |
wangzhenxing
|
6be87dec74
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 11:00:42 +08:00 |
jiaoyangna
|
501d3758fd
|
升级显示消耗
|
2022-01-17 10:59:48 +08:00 |
jiaoyangna
|
6d3d7f5e4f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 10:59:08 +08:00 |
jiaoyangna
|
28b3fb33f3
|
技能报错修改提交
|
2022-01-17 10:56:38 +08:00 |
ZhangBiao
|
ffbdafd13e
|
【修行】红点检测
|
2022-01-17 10:53:06 +08:00 |
wangzhenxing
|
a7ad2ee1f6
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 10:50:14 +08:00 |
ZhangBiao
|
98f89d8a9b
|
【摘星阁+修为】装备属性展示+修为红点检测
|
2022-01-17 10:44:43 +08:00 |
ZhangBiao
|
91f9589043
|
【摘星阁】装备属性
|
2022-01-17 10:33:42 +08:00 |
ZhangBiao
|
e93b2816b4
|
【摘星阁】装备摘星阁属性拆分
|
2022-01-17 10:24:27 +08:00 |
jiaoyangna
|
fbd1c9aa43
|
许愿神将修改提交
|
2022-01-17 09:41:00 +08:00 |
ZhangBiao
|
10070d14ca
|
【跳转】提交
|
2022-01-15 18:29:18 +08:00 |
ZhangBiao
|
a556bf7761
|
【玩家信息】提交
|
2022-01-15 18:17:46 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
ZhangBiao
|
aa90cae885
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 18:07:57 +08:00 |
ZhangBiao
|
2b8cb81ff3
|
【充值】跳转修改
|
2022-01-15 18:07:43 +08:00 |
wangzhenxing
|
692c333b34
|
[战斗]========被动421修改提交
|
2022-01-15 17:44:32 +08:00 |
wangzhenxing
|
1d170dfd2d
|
[图鉴]==========图鉴详情修改提交
|
2022-01-15 17:12:40 +08:00 |
ZhangBiao
|
fa7123e998
|
【主题活动】0120-0202寻宝迷踪珍奇宝阁报错
|
2022-01-15 15:53:28 +08:00 |
ZhangBiao
|
3ad8b6b6c3
|
【玩家信息】提交
|
2022-01-15 15:44:08 +08:00 |
ZhangBiao
|
1f9275e9d8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 15:05:35 +08:00 |
ZhangBiao
|
c373f8d014
|
【修改】提交
|
2022-01-15 15:05:26 +08:00 |
wangzhenxing
|
6f56edbdf7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 14:46:55 +08:00 |
ZhangBiao
|
38fb5a9ada
|
【每日特惠】每日特惠中免费和7天的按钮消失了
|
2022-01-15 14:40:06 +08:00 |
wangzhenxing
|
c083c2c903
|
【战斗】====被动419修改
|
2022-01-15 14:38:56 +08:00 |
ZhangBiao
|
756dc54595
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 14:35:21 +08:00 |
ZhangBiao
|
f4c1b9d097
|
【修改】提交
|
2022-01-15 14:34:55 +08:00 |
wangzhenxing
|
e8f8f5ca59
|
[图鉴]=====图鉴详情修改提交
|
2022-01-15 14:32:55 +08:00 |
ZhangBiao
|
bca67f4fd6
|
【玩家信息】报错修改
|
2022-01-15 13:26:22 +08:00 |
ZhangBiao
|
28d4b2a8be
|
【玩家信息】提交
|
2022-01-15 13:07:28 +08:00 |
ZhangBiao
|
7feefd2078
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 13:01:44 +08:00 |
ZhangBiao
|
fa1c832170
|
【坐骑】增加详细信息
|
2022-01-15 13:00:45 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +08:00 |
ZhangBiao
|
ed48c7ce00
|
【寻仙招募】修改,提交
|
2022-01-15 10:27:48 +08:00 |
ZhangBiao
|
232491eb95
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 09:14:10 +08:00 |
jiaoyangna
|
9f5addf443
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 19:14:04 +08:00 |
jiaoyangna
|
98f23e56ea
|
神将修改提交
|
2022-01-14 19:13:46 +08:00 |
wangzhenxing
|
c2c9eda981
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:50:17 +08:00 |
wangzhenxing
|
05377b9595
|
[图鉴]==== 图鉴 图鉴详情界面修改
|
2022-01-14 18:49:49 +08:00 |
jiaoyangna
|
75be0809dd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:49:21 +08:00 |
jiaoyangna
|
b0611db595
|
神将技能修改提交
|
2022-01-14 18:48:23 +08:00 |
ZhangBiao
|
e1a52271be
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:47:55 +08:00 |
ZhangBiao
|
5d2fdc5773
|
【仙缘汇聚箱】报错修改
|
2022-01-14 18:47:41 +08:00 |
jiaoyangna
|
2df72a0edd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:40:17 +08:00 |
jiaoyangna
|
3369bcc73c
|
心愿修改提交
|
2022-01-14 18:40:00 +08:00 |
ZhangBiao
|
3e47cae110
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:28:47 +08:00 |
ZhangBiao
|
d7bd3a07d8
|
【心愿抽奖】报错修改
|
2022-01-14 18:28:36 +08:00 |
jiaoyangna
|
ea69ec6643
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:59:05 +08:00 |
jiaoyangna
|
81ce84e7be
|
升级修改提交
|
2022-01-14 17:57:12 +08:00 |
ZhangBiao
|
0b7943c391
|
【家园】特权按钮修改
|
2022-01-14 17:44:54 +08:00 |
ZhangBiao
|
cbea9006b3
|
【家园】资源替换
|
2022-01-14 17:38:46 +08:00 |
jiaoyangna
|
b249db487a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:14:11 +08:00 |
jiaoyangna
|
c11db3056f
|
神将修改
|
2022-01-14 17:13:36 +08:00 |
gaoxin
|
7c5284b1e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:11:08 +08:00 |
gaoxin
|
df2e07b0e3
|
【心魔编队】保存后自动关闭界面
|
2022-01-14 17:11:02 +08:00 |
jiaoyangna
|
0189f5c742
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 16:15:17 +08:00 |
jiaoyangna
|
3f267894a8
|
神将修改提交
|
2022-01-14 16:14:52 +08:00 |
ZhangBiao
|
8f554eca59
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 16:02:59 +08:00 |
gaoxin
|
1c827a3a23
|
【关卡】有可挑战关卡时添加小手显示
|
2022-01-14 16:02:10 +08:00 |
jiaoyangna
|
d6521af965
|
许愿神将边框修改
|
2022-01-14 15:52:16 +08:00 |
ZhangBiao
|
28d3f421bc
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交
|
2022-01-14 15:44:45 +08:00 |
jiaoyangna
|
2142bc452b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:53:14 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
ZhangBiao
|
771c445488
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 14:16:47 +08:00 |
ZhangBiao
|
f9990072d5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:15:16 +08:00 |
ZhangBiao
|
930b93286d
|
【家园】数据不更新修改
|
2022-01-14 14:14:48 +08:00 |
gaoxin
|
69e6011950
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 13:52:55 +08:00 |
gaoxin
|
09f65e9f38
|
【修行】优化修行突破后显示
|
2022-01-14 13:51:13 +08:00 |
wangzhenxing
|
cff6c3f21b
|
[战斗]=====被动418-421提交
|
2022-01-14 13:49:39 +08:00 |
jiaoyangna
|
981aba2417
|
神将情报修改提交
|
2022-01-14 11:26:13 +08:00 |
jiaoyangna
|
8377e33b31
|
神将情报修改提交
|
2022-01-14 10:50:51 +08:00 |
jiaoyangna
|
17db5f29c4
|
框修改提交
|
2022-01-14 10:25:27 +08:00 |
jiaoyangna
|
ed63358ab6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
|
2022-01-14 10:19:54 +08:00 |
jiaoyangna
|
e4ea506ed1
|
神将情报修改提交
|
2022-01-14 10:17:19 +08:00 |
ZhangBiao
|
8af671a6f8
|
【装备加持】排行榜查看玩家时装备加持不显示突破数值和突破属性
|
2022-01-14 10:14:29 +08:00 |
ZhangBiao
|
5b36346da3
|
【玩家信息】提交
|
2022-01-13 18:29:12 +08:00 |
ZhangBiao
|
27cb303fc3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 18:27:01 +08:00 |
ZhangBiao
|
1e234c6aa8
|
【家园】材料不足突破红点修复
|
2022-01-13 18:26:39 +08:00 |
jiaoyangna
|
fe4c807633
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 16:41:45 +08:00 |
jiaoyangna
|
1515c59bac
|
法宝聚灵添加白金
|
2022-01-13 16:41:23 +08:00 |
gaoxin
|
70d753cce5
|
极速探索按钮颜色调整
|
2022-01-13 16:41:12 +08:00 |
ZhangBiao
|
f043b3e62f
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-13 16:04:36 +08:00 |
ZhangBiao
|
898f88a0b9
|
【寻仙招募】修改奖励显示内容
|
2022-01-13 16:03:20 +08:00 |
ZhangBiao
|
2599afd6de
|
【寻仙招募】心愿选飞升石,查看奖励报错
|
2022-01-13 15:28:09 +08:00 |
ZhangBiao
|
36b475ee15
|
【玩家信息】增加额外属性
|
2022-01-13 15:23:59 +08:00 |
jiaoyangna
|
a4848406b1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 14:00:28 +08:00 |
jiaoyangna
|
0e8e6e1874
|
探索修改提交
|
2022-01-13 13:59:15 +08:00 |
gaoxin
|
8351aba49c
|
【战斗】我方buff显示位置修改
|
2022-01-13 13:56:08 +08:00 |
gaoxin
|
455cdcd19c
|
【日常副本】列表动画添加
|
2022-01-13 12:04:22 +08:00 |
jiaoyangna
|
07534deff9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 11:18:28 +08:00 |
jiaoyangna
|
8b4533aac9
|
一键探索调整编队后探索地图修改提交
|
2022-01-13 11:17:18 +08:00 |
wangzhenxing
|
a16b592892
|
[飞升]=========飞升优化修改
|
2022-01-13 10:01:22 +08:00 |
ZhangBiao
|
48901f3817
|
【寻仙招募】心愿单中添加飞升石道具
|
2022-01-12 18:27:16 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
ZhangBiao
|
1e8cceea57
|
【家园】特效层级修改
|
2022-01-12 15:55:24 +08:00 |
ZhangBiao
|
a74799caea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-12 15:38:45 +08:00 |
ZhangBiao
|
f131da8558
|
【方寸寻宝】点击自选箱显示详细信息
|
2022-01-12 15:38:31 +08:00 |
jiaoyangna
|
05e078dadc
|
探索引导修改提交
|
2022-01-12 15:27:35 +08:00 |
jiaoyangna
|
6cc1b55503
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-12 14:36:43 +08:00 |
jiaoyangna
|
0b4cfe3a74
|
点击技能切换修改
|
2022-01-12 14:35:27 +08:00 |
ZhangBiao
|
6d29d5dce2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-12 14:28:26 +08:00 |
ZhangBiao
|
373ae35652
|
【家园】详情位置修改
|
2022-01-12 14:28:14 +08:00 |