wangzhenxing
|
e498661919
|
神印添加背包分解
|
2022-04-24 16:36:27 +08:00 |
wangzhenxing
|
7cdf302e90
|
神印修改提交
|
2022-04-24 14:20:11 +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
|
f49bb38f8f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-20 16:20:41 +08:00 |
wangzhenxing
|
3021107155
|
globaldefine提交
|
2022-04-20 16:20:24 +08:00 |
yuanshuai
|
50683260c7
|
挑战副本红点提交
|
2022-04-20 13:23:08 +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
|
b4a626d9e2
|
挑战副本脚本修改提交
|
2022-04-18 18:48:06 +08:00 |
yuanshuai
|
9ebdab46b3
|
挑战副本相关脚本提交
|
2022-04-14 16:07:45 +08:00 |
wangzhenxing
|
f442f6df70
|
globaldefine提交
|
2022-04-06 13:56:39 +08:00 |
jiaoyangna
|
7a1ccac3cd
|
【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
|
2022-04-02 14:45:12 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
jiaoyangna
|
5348a49256
|
Revert "冲突提交"
This reverts commit b5a29c9152 .
|
2022-03-22 11:06:54 +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
|
def9ca5701
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-21 17:38:57 +08:00 |
wangzhenxing
|
47a9fc98e3
|
globaldefine常量提交
|
2022-03-21 17:38:27 +08:00 |
jiaoyangna
|
18803bfc29
|
东海寻仙提交
|
2022-03-18 13:25:09 +08:00 |
jiaoyangna
|
31b1721510
|
探索提交
|
2022-03-17 15:21:08 +08:00 |
gaoxin
|
de178b9875
|
【锻器阁】未解锁的功能显示未解锁提示
|
2022-03-11 16:36:47 +08:00 |
张彪
|
4d97370a24
|
【车迟斗法】跨服
|
2022-03-03 16:52:08 +08:00 |
张彪
|
5a416c5149
|
【车迟斗法】工会界面倒计时
|
2022-03-03 13:30:25 +08:00 |
wangzhenxing
|
51e89fea29
|
英雄觉醒后天赋显示修改
|
2022-02-21 14:25:52 +08:00 |
张彪
|
51196cf150
|
【灵兽宝阁】新增几档灵兽特惠礼包界面提交
|
2022-02-18 15:14:25 +08:00 |
张彪
|
7083b34f51
|
【战力冲刺】提交
|
2022-02-18 14:05:59 +08:00 |
张彪
|
14af727eab
|
【战力冲刺】提交
|
2022-02-17 16:27:36 +08:00 |
gaoxin
|
2342bd8af8
|
【拍脸】寻仙招募拍脸添加
|
2022-02-23 18:08:50 +08:00 |
jiaoyangna
|
7e62f47ca8
|
【ID1011130】
【活动优化】超值返利
|
2022-02-11 11:26:34 +08:00 |
wangzhenxing
|
01506ba48c
|
[角色天赋]======角色天赋显示修改
|
2022-02-10 17:52:40 +08:00 |
gaoxin
|
2704959c15
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-08 13:58:58 +08:00 |
jiaoyangna
|
b28899db3f
|
神将置换星级设置报错修改提交
|
2022-02-08 13:40:25 +08:00 |
gaoxin
|
4ff738d8a2
|
【事件上报】修改区服字段上报内容为账号id
|
2022-02-08 11:02:21 +08:00 |
张彪
|
d1bb3391ac
|
【超值基金】提交
|
2022-01-24 17:09:55 +08:00 |
wangzhenxing
|
b18db8765d
|
[飞升]=====飞升特效修改提交
|
2022-01-21 17:09:14 +08:00 |
wangzhenxing
|
e5494e65ab
|
[飞升]=====图鉴显示修改
|
2022-01-21 13:55:17 +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
|
f40c997a4f
|
[飞升]======飞升特效修改
|
2022-01-20 10:09:57 +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
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |