zhangqiang
|
256a3e7571
|
【十绝阵】跨服服务器名字显示
|
2021-08-24 18:23:32 +08:00 |
jiaoyangna
|
027f2a3d86
|
十绝阵修改提交
|
2021-08-12 14:40:12 +08:00 |
jiaoyangna
|
4fe156364d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-12 11:41:37 +08:00 |
jiaoyangna
|
025583762d
|
十绝阵修改
|
2021-08-12 11:36:48 +08:00 |
jiaoyangna
|
ce4a166777
|
Revert "跨服十绝阵修改提交"
This reverts commit 657690cf3f .
|
2021-08-12 11:22:05 +08:00 |
jiaoyangna
|
657690cf3f
|
跨服十绝阵修改提交
|
2021-08-12 11:18:43 +08:00 |
jiaoyangna
|
16fc435113
|
跨服十绝阵修改提交
|
2021-08-12 10:55:05 +08:00 |
zhangqiang
|
36ec633294
|
【公会红包】有动画时点赞按钮显示位置不对 解决方法 缩放去掉动画
|
2021-08-10 15:18:13 +08:00 |
zhangqiang
|
14d50731a8
|
【十绝阵】显示修改 罗浮争锋 适配
|
2021-08-02 17:35:27 +08:00 |
zhangqiang
|
78ec831ca1
|
【跨服详情】修改提交
|
2021-07-30 11:59:39 +08:00 |
jiaoyangna
|
52e9f406aa
|
十绝阵当我的排名为0 时报错
|
2021-07-29 16:10:39 +08:00 |
jiaoyangna
|
44965dd1c2
|
跨服十绝阵提交
|
2021-07-29 12:09:03 +08:00 |
ZhangBiao
|
263cb18d03
|
【车迟斗法】玩法内等待次数刷新,红点不显示,退出重进显示正常 修复
|
2021-07-28 15:16:10 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
JieLing
|
d2090cb930
|
【跨服】修复角色信息英雄详细信息报错
|
2021-07-26 11:10:11 +08:00 |
jiaoyangna
|
6c59983568
|
工会查看信息报错修改
|
2021-07-24 15:18:38 +08:00 |
gaoxin
|
0db39ccbe3
|
Merge branch 'china/ios' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
|
2021-07-22 19:39:14 +08:00 |
ZhangBiao
|
b0d10a29d2
|
【公会】公会按钮位置调整
|
2021-07-22 17:41:01 +08:00 |
ZhangBiao
|
db258d27cb
|
【副本界面】调整
|
2021-07-22 15:13:24 +08:00 |
JLIOSM1
|
d680e5a507
|
Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
# Assets/StreamingAssets/Res/PackConfig.txt
# Assets/StreamingAssets/Res/_ReadMe.md
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
# Assets/StreamingAssets/Res/loading1.png
# Assets/StreamingAssets/Res/loading1.png.meta
# Assets/StreamingAssets/Res/loading2.png
# Assets/StreamingAssets/Res/loading2.png.meta
# Assets/StreamingAssets/Res/loading3.png
# Assets/StreamingAssets/Res/loading3.png.meta
# Assets/StreamingAssets/Res/loading4.png
# Assets/StreamingAssets/Res/loading4.png.meta
# Assets/StreamingAssets/Res/loading5.png
# Assets/StreamingAssets/Res/loading5.png.meta
# Assets/StreamingAssets/Res/loading6.png
# Assets/StreamingAssets/Res/loading6.png.meta
# Assets/StreamingAssets/Res/loading_caohua.png.meta
# Assets/StreamingAssets/Res/loading_xipu.png.meta
# Assets/StreamingAssets/Res/login_caohua.png.meta
# Assets/StreamingAssets/Res/login_video.mp4.meta
# Assets/StreamingAssets/Res/login_xipu.png.meta
|
2021-07-21 17:15:36 +08:00 |
JLIOSM1
|
3027e991c9
|
【IOS提审】提审服关闭公会红包,无尽秘宝按钮显示
|
2021-07-21 14:55:47 +08:00 |
zhangqiang
|
fbc490737b
|
【公会】在公会界面散会,黑屏
|
2021-07-20 11:09:43 +08:00 |
wangzhenxing
|
dad8dbf11b
|
[公会红包]=============红包抢完显示白片修改
|
2021-07-07 15:09:06 +08:00 |
ZhangBiao
|
53567ea586
|
【Log】清除带颜色的Log
|
2021-07-01 16:33:40 +08:00 |
zhangqiang
|
34fbfe02d1
|
【线上问题】十绝阵挑战次数显示负数
|
2021-06-30 18:28:51 +08:00 |
wangzhenxing
|
4ad64a41f2
|
[bug]==========福利红包红点修改
|
2021-06-30 18:00:52 +08:00 |
zhangqiang
|
aa666a5158
|
【公会】带神印的成员信息报错
|
2021-06-16 14:50:19 +08:00 |
wangzhenxing
|
9914b6ef76
|
[公会福利红包]========红包红点优化
|
2021-06-09 10:35:11 +08:00 |
jiaoyangna
|
3d38a63266
|
【ID1009231】
【公会红包】拥有福利红包时,退出公会加提示
|
2021-06-08 21:08:16 +08:00 |
jiaoyangna
|
d91a94d309
|
【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
|
2021-06-08 20:47:03 +08:00 |
wangzhenxing
|
6158f0916a
|
[福利红包]=====红包红点修改
|
2021-06-04 14:19:16 +08:00 |
ZhangBiao
|
d19325ce7b
|
【公会红点】报错修改
|
2021-06-03 17:59:14 +08:00 |
zhangqiang
|
f265cb07ef
|
【山河社稷图】红点帮错 公会技能属性名称修改
|
2021-06-02 17:39:11 +08:00 |
wangzhenxing
|
5bcfe86999
|
【公会红包】====红包刷新逻辑修改
|
2021-06-01 16:59:27 +08:00 |
ZhangBiao
|
6d0e6a9e1a
|
【名字颜色】公会申请
|
2021-05-31 15:18:02 +08:00 |
ZhangBiao
|
0259117f7b
|
【名字颜色】修改
|
2021-05-31 15:00:28 +08:00 |
ZhangBiao
|
a6b6b2222b
|
【牛气冲天】奖励位置修改
|
2021-05-31 11:58:45 +08:00 |
wangzhenxing
|
b1fcc5d4e5
|
[限时活动,福利红包]=======bug修改
|
2021-05-29 20:36:26 +08:00 |
wangzhenxing
|
62f5514f80
|
[限时抽卡] 【公会福利红包】bug修改
|
2021-05-29 16:26:05 +08:00 |
wangzhenxing
|
ee90abf1b4
|
【公会】========加入宗门报错修改提交
|
2021-05-28 19:41:43 +08:00 |
gaoxin
|
1e36398a50
|
【内存优化】Util.Loadsprite 替换为 spLoader
|
2021-05-28 14:41:58 +08:00 |
wangzhenxing
|
347341ca02
|
[福利]红包修改提交
|
2021-05-28 12:36:39 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
ZhangBiao
|
458ab29053
|
【清除Log】清楚部分Log
|
2021-05-28 10:33:53 +08:00 |
wangzhenxing
|
d821836909
|
福利红包修改提交
|
2021-05-26 16:03:28 +08:00 |
wangzhenxing
|
69d0f3ab39
|
公会福利红包修改提交
|
2021-05-25 14:52:02 +08:00 |
wangzhenxing
|
31a58128c1
|
退出公会黑屏bug修改
|
2021-05-24 18:27:13 +08:00 |
gaoxin
|
24498b21a9
|
【公会】成员信息界面报错修复
|
2021-05-24 16:58:26 +08:00 |
wangzhenxing
|
769042a739
|
master_test_gn协议提交
|
2021-05-24 14:14:11 +08:00 |