ZhangBiao
|
7f19809419
|
【修行】提交
|
2021-05-20 20:12:01 +08:00 |
ZhangBiao
|
b22b8abd6a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 17:38:07 +08:00 |
ZhangBiao
|
b1e7cd1164
|
【修行】提交
|
2021-05-20 17:37:56 +08:00 |
gaoxin
|
239f8c50e4
|
【社稷大典】奖励提示添加
|
2021-05-20 16:51:09 +08:00 |
gaoxin
|
bd27d190ac
|
【屏幕适配】部分界面优化
|
2021-05-20 16:12:15 +08:00 |
gaoxin
|
16596f733d
|
【竞技场】免费次数提示添加
|
2021-05-20 14:59:40 +08:00 |
zhangqiang
|
ede26383c8
|
【特权加等级奖励】2
|
2021-05-20 14:19:29 +08:00 |
ZhangBiao
|
ae10b715cd
|
【修行】神印界面提交
|
2021-05-20 11:57:27 +08:00 |
ZhangBiao
|
40cafcca32
|
【修行】神印界面结构修改
|
2021-05-20 11:18:42 +08:00 |
ZhangBiao
|
5ea5e5b689
|
【修行】紫府神印界面添加资源
|
2021-05-20 10:55:33 +08:00 |
ZhangBiao
|
2870091514
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-19 20:53:37 +08:00 |
ZhangBiao
|
be1085d2bb
|
Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
|
2021-05-19 20:01:57 +08:00 |
ZhangBiao
|
7d5de9d23a
|
【修行】恭喜破镜
|
2021-05-19 18:27:57 +08:00 |
jiaoyangna
|
2020d3aa18
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-19 17:41:03 +08:00 |
jiaoyangna
|
e295c16960
|
图片提交
|
2021-05-19 17:40:01 +08:00 |
ZhangBiao
|
3bb85fd5db
|
【修行】新增通用恭喜界面
|
2021-05-19 16:56:49 +08:00 |
ZhangBiao
|
e491f58adc
|
【修行】提交
|
2021-05-19 16:14:09 +08:00 |
gaoxin
|
989361e574
|
Merge branch 'china/ios' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
|
2021-05-19 15:15:13 +08:00 |
ZhangBiao
|
d2e6f593be
|
【修行】小点提交
|
2021-05-19 14:46:51 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
jiaoyangna
|
ac622ed41d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-19 10:31:03 +08:00 |
jiaoyangna
|
bb6147ca6f
|
每日累计充值。转盘提交
|
2021-05-19 10:30:50 +08:00 |
zhangqiang
|
491b7b54a7
|
【化虚坛优化】化虚坛中有可合成的将时,在神将头像、页签按钮,和化虚坛入口上添加红点提示
|
2021-05-19 10:27:55 +08:00 |
ZhangBiao
|
916f5af5c8
|
【修行】资源调整
|
2021-05-19 10:23:39 +08:00 |
jiaoyangna
|
3cf21f5e85
|
30、68元档位奖励图标及特效框需同时出现,效果同首次点击18元档位展示效果即可
|
2021-05-18 21:14:22 +08:00 |
jiaoyangna
|
83697a9de4
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-18 20:53:23 +08:00 |
ZhangBiao
|
b88957bcad
|
【修行】神将增加神印显示
|
2021-05-18 20:04:52 +08:00 |
zhangqiang
|
f7ee7f5642
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 3
|
2021-05-18 18:18:45 +08:00 |
zhangqiang
|
a40ec43b81
|
【山河社稷图】章节开启界面修改
|
2021-05-18 16:54:35 +08:00 |
ZhangBiao
|
bcf845ae38
|
【修行】玩家信息界面怎加技能详情
|
2021-05-18 16:13:26 +08:00 |
zhangqiang
|
c27ddeb2a4
|
【山河社稷图】编队加职能 调副关卡恭喜获得背景层级
|
2021-05-18 15:17:05 +08:00 |
wangzhenxing
|
9ebc0f8401
|
公告修改提交
|
2021-05-18 15:01:59 +08:00 |
ZhangBiao
|
93b8746cfe
|
【修行】玩家信息界面神印提交
|
2021-05-18 14:59:47 +08:00 |
jiaoyangna
|
ae913260f8
|
18、30、68元档位切换按钮,可触碰区域加大
|
2021-05-18 11:44:51 +08:00 |
ZhangBiao
|
d0d20db65b
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 17:57:45 +08:00 |
zhangqiang
|
d1e27ccdc3
|
【山河社稷图】编队bug
|
2021-05-17 17:54:21 +08:00 |
ZhangBiao
|
8e1b42c0ac
|
【修行】名字颜色修改
|
2021-05-17 17:28:37 +08:00 |
zhangqiang
|
f6fb0c2071
|
【山河社稷图】宝箱奖励预览
|
2021-05-17 15:39:08 +08:00 |
gaoxin
|
b9d362b333
|
【屏幕适配】活动适配优化
|
2021-05-17 14:32:42 +08:00 |
zhangqiang
|
8e428148c4
|
【山河社稷图】提交
|
2021-05-17 11:15:43 +08:00 |
zhangqiang
|
e763e54799
|
Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-05-17 11:04:01 +08:00 |
ZhangBiao
|
f3cb51c858
|
【预设冲突】冲突修改后提交
|
2021-05-17 10:35:58 +08:00 |
ZhangBiao
|
8003c43f71
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 10:32:30 +08:00 |
ZhangBiao
|
307c2c1e37
|
【冲突处理】复制general(big)popup
|
2021-05-17 10:31:45 +08:00 |
ZhangBiao
|
29b8fd144e
|
Revert "【修行】提交,预设冲突处理"
This reverts commit 79910218c5.
|
2021-05-17 10:29:34 +08:00 |
ZhangBiao
|
79910218c5
|
【修行】提交,预设冲突处理
|
2021-05-17 10:21:08 +08:00 |
ZhangBiao
|
5fe75af0bf
|
Merge branch 'china/dev' into 0功能/修行玩法
|
2021-05-17 10:15:42 +08:00 |
jiaoyangna
|
9662b5f236
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
# Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
# Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
|
2021-05-15 16:37:00 +08:00 |
jiaoyangna
|
5ad6b8d92d
|
【活动优化】福星高照奖励调整
|
2021-05-15 16:25:58 +08:00 |
jiaoyangna
|
269d1c4ae7
|
每日豪礼修改提交
|
2021-05-15 16:14:39 +08:00 |
jiaoyangna
|
58b2beb015
|
文字曲线提交
|
2021-05-15 15:39:53 +08:00 |
jiaoyangna
|
6a13a56902
|
两个礼包预设修改
(cherry picked from commit 2bd439879b)
|
2021-05-14 19:10:05 +08:00 |
zhangqiang
|
57e1e32e32
|
【山河社稷图】提交
|
2021-05-14 15:03:48 +08:00 |
ZhangBiao
|
410262cee8
|
Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-14 13:27:01 +08:00 |
ZhangBiao
|
3229d0693b
|
【修行】提交
|
2021-05-14 13:21:38 +08:00 |
ZhangBiao
|
4b20254ddd
|
【修行】提交
|
2021-05-13 21:03:27 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
jiaoyangna
|
2ed525a64d
|
限时兑换预设修改
|
2021-05-13 20:06:07 +08:00 |
jiaoyangna
|
b7dbc1919a
|
乾坤宝盒预设修改
|
2021-05-13 18:17:41 +08:00 |
jiaoyangna
|
6393a76658
|
按钮修改
|
2021-05-13 17:57:19 +08:00 |
ZhangBiao
|
8df2338780
|
【修行】提交
|
2021-05-13 17:37:47 +08:00 |
jiaoyangna
|
ed41c4cf3c
|
成长礼包
|
2021-05-13 11:52:04 +08:00 |
zhangqiang
|
da33b98dfb
|
【山河社稷图】提交
|
2021-05-13 09:56:11 +08:00 |
jiaoyangna
|
c66b323044
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-12 21:05:36 +08:00 |
ZhangBiao
|
b6854deccd
|
【修行】协议提交
|
2021-05-12 18:47:47 +08:00 |
jiaoyangna
|
139b4b2387
|
【幸运探宝优化】界面显示规则优化
|
2021-05-12 18:40:54 +08:00 |
jiaoyangna
|
8166db38d5
|
【幸运探宝优化】界面显示规则优化
|
2021-05-12 18:36:29 +08:00 |
ZhangBiao
|
d5799c1030
|
【修行】神印界面提交
|
2021-05-12 18:24:50 +08:00 |
ZhangBiao
|
7d63d1e191
|
【修行】提交
|
2021-05-12 17:40:38 +08:00 |
jiaoyangna
|
06fb7e218f
|
主题活动提交
(cherry picked from commit 847adfc761)
|
2021-05-12 17:39:46 +08:00 |
jiaoyangna
|
3c04e8dbe1
|
[主题活动修改提交]
(cherry picked from commit f88ccd8f68)
|
2021-05-12 17:37:59 +08:00 |
jiaoyangna
|
90b59093f0
|
修改礼包预设
|
2021-05-12 14:41:00 +08:00 |
jiaoyangna
|
16a67e5190
|
【活动优化】每日豪礼界面优化调整
|
2021-05-12 10:47:48 +08:00 |
zhangqiang
|
1ed38be14a
|
【山河社稷图】提交
|
2021-05-11 20:20:38 +08:00 |
ZhangBiao
|
7ba5209394
|
【修行】提交
|
2021-05-11 17:23:19 +08:00 |
jiaoyangna
|
dc66043a06
|
【活动优化】百宝商会增加一键购买,礼包金额及奖励变更
|
2021-05-11 16:59:48 +08:00 |
zhangqiang
|
effe90990f
|
【山河社稷图】提交
|
2021-05-11 15:12:37 +08:00 |
ZhangBiao
|
7104d77d7e
|
【修行】开坑
|
2021-05-11 15:09:25 +08:00 |
gaoxin
|
58618e2062
|
【帮助】修复界面可以穿透点击事件的问题
|
2021-05-11 11:06:41 +08:00 |
jiaoyangna
|
847adfc761
|
主题活动提交
|
2021-05-10 20:20:20 +08:00 |
jiaoyangna
|
4447f37b62
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-10 15:05:31 +08:00 |
jiaoyangna
|
fb5f703272
|
限时兑换提交
|
2021-05-10 15:05:27 +08:00 |
ZhangBiao
|
16e5b894e3
|
【天尊降世】增加第三个奖励红点
|
2021-05-10 10:35:08 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +08:00 |
zhangqiang
|
1745c20ab0
|
【山河社稷图】提交
|
2021-05-07 20:24:41 +08:00 |
zhangqiang
|
1db33218d8
|
【山河社稷图】首提
|
2021-05-07 14:44:50 +08:00 |
jiaoyangna
|
08ef62eb2b
|
至尊降世 前往修改
|
2021-04-30 12:42:31 +08:00 |
wangzhenxing
|
d4a0a902bd
|
聊天界面称号特效显示修改
|
2021-04-30 11:17:02 +08:00 |
gaoxin
|
3c251062ea
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 20:48:44 +08:00 |
gaoxin
|
0b260fd03a
|
【资源】至尊降世资源修改
|
2021-04-29 20:48:39 +08:00 |
jiaoyangna
|
b66367fd85
|
修改对话出现时间
|
2021-04-29 20:20:37 +08:00 |
gaoxin
|
7bae49b1c2
|
【至尊降世】特效修改
|
2021-04-29 17:53:40 +08:00 |
jiaoyangna
|
aba55c9b7c
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 17:10:13 +08:00 |
ZhangBiao
|
bc1b55d7f3
|
【踏碎凌霄】增加包厢数量显示
|
2021-04-29 16:19:58 +08:00 |
ZhangBiao
|
79fb3ef29f
|
【踏碎凌霄】“下档奖励”问题修改
|
2021-04-29 15:46:39 +08:00 |
ZhangBiao
|
a725565ac6
|
【踏碎凌霄】修改提交
|
2021-04-29 15:40:10 +08:00 |
jiaoyangna
|
1da013efda
|
剧情提交
|
2021-04-29 15:35:18 +08:00 |
ZhangBiao
|
6e4b930e84
|
【踏碎凌霄】宝箱修改
|
2021-04-29 14:52:14 +08:00 |
ZhangBiao
|
51fa96bd14
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 14:34:08 +08:00 |
ZhangBiao
|
5da3914599
|
【踏碎凌霄优化】玩法界面上显示下一个目标的血条
|
2021-04-29 14:33:58 +08:00 |