ZhangBiao
|
6c31fa860d
|
【右上角活动】红点修改
|
2021-06-07 13:32:01 +08:00 |
ZhangBiao
|
a96a61ec77
|
【逐胜之巅】入口调整至左侧
|
2021-06-07 11:18:37 +08:00 |
ZhangBiao
|
d744c010bf
|
【主城】红点
|
2021-06-05 11:14:36 +08:00 |
gaoxin
|
079afb4e8d
|
Revert "【Debug】红点不消失问题debug日志添加"
This reverts commit d20e47535e .
|
2021-06-03 22:37:30 +08:00 |
gaoxin
|
d20e47535e
|
【Debug】红点不消失问题debug日志添加
|
2021-06-03 19:50:02 +08:00 |
ZhangBiao
|
592fad463d
|
【玉皇大帝】入口顯示
|
2021-06-02 15:12:44 +08:00 |
ZhangBiao
|
a6c7de8151
|
【主界面】成长礼包入口提交
|
2021-06-02 14:56:09 +08:00 |
ZhangBiao
|
0798248214
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 14:50:26 +08:00 |
ZhangBiao
|
e1145deced
|
【玉皇大帝入口】如果购买完成长礼包,就不显示
|
2021-06-02 14:50:18 +08:00 |
gaoxin
|
4eea852340
|
【称号】修复主界面称号偶现没有特效的问题,聊天界面称号逻辑修改
|
2021-06-02 14:34:51 +08:00 |
ZhangBiao
|
7679f85af3
|
【修行】图标调整
|
2021-06-02 11:08:24 +08:00 |
gaoxin
|
39bb3d5c06
|
【称号】修改称号节点为通用节点
|
2021-06-01 21:13:03 +08:00 |
gaoxin
|
58faec4feb
|
【红点】主界面鸿蒙阵红点没有清除
|
2021-06-01 15:44:18 +08:00 |
jiaoyangna
|
8f31b07d52
|
主城百宝时间修改提交
|
2021-06-01 14:54:46 +08:00 |
ZhangBiao
|
bfd8bee59e
|
【青龙秘宝】刷新不及时修改
|
2021-05-31 20:09:19 +08:00 |
ZhangBiao
|
19bce27f34
|
【修行】提交3
|
2021-05-29 19:58:52 +08:00 |
ZhangBiao
|
717b0039cb
|
【修行】印记提交2
|
2021-05-29 19:49:25 +08:00 |
ZhangBiao
|
1d4842a7d6
|
【修行】印记提交
|
2021-05-29 19:32:47 +08:00 |
ZhangBiao
|
749184a59a
|
【修行】提交
|
2021-05-29 19:22:35 +08:00 |
ZhangBiao
|
4cfff84328
|
【修行】印记提交
|
2021-05-29 19:14:24 +08:00 |
ZhangBiao
|
5aeb2f0ed3
|
【修行】名字左侧印记提交
|
2021-05-29 18:06:15 +08:00 |
zhangqiang
|
78ece97bfd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:54:30 +08:00 |
zhangqiang
|
1dc1ad1db1
|
【幸运探宝】加标签
|
2021-05-28 15:54:20 +08:00 |
ZhangBiao
|
3c67b0b8f3
|
【主城】icon问题调整
|
2021-05-28 15:35:02 +08:00 |
gaoxin
|
58aa9bce25
|
【嘿嘿】有个报错
|
2021-05-27 18:30:45 +08:00 |
gaoxin
|
9f8858b4f7
|
【主界面】左上角按钮自动排列
|
2021-05-27 18:20:32 +08:00 |
gaoxin
|
ba4debba7b
|
【主界面】左上角按钮自动排列
|
2021-05-27 18:13:03 +08:00 |
gaoxin
|
538c8d984e
|
【主界面】优化提示框层级问题
|
2021-05-27 10:47:04 +08:00 |
ZhangBiao
|
bc2c2eb916
|
【主城】主城小人,看不见自己,
|
2021-05-26 21:05:06 +08:00 |
ZhangBiao
|
f186f29646
|
提交
|
2021-05-26 14:44:22 +08:00 |
ZhangBiao
|
b526f58bc3
|
【主界面】右上角调整
|
2021-05-26 13:48:33 +08:00 |
ZhangBiao
|
5155b4aeb3
|
【主界面】提交
|
2021-05-26 11:53:45 +08:00 |
ZhangBiao
|
d7cda43ed0
|
【主界面】右上伸缩条调整
|
2021-05-26 11:16:27 +08:00 |
ZhangBiao
|
f3cf294f42
|
【主界面】右上伸缩条首充引导调整,修行调整
|
2021-05-26 10:16:24 +08:00 |
ZhangBiao
|
9e6dc29cb9
|
【主界面】右上伸缩条红点
|
2021-05-25 21:08:48 +08:00 |
ZhangBiao
|
d835687e8c
|
【主城】伸缩条调整
|
2021-05-25 18:33:26 +08:00 |
ZhangBiao
|
d41ba9f65d
|
【主城】右侧伸缩条
|
2021-05-25 18:21:52 +08:00 |
ZhangBiao
|
cecea9b415
|
【修行】主界面 修行提交 1
|
2021-05-25 10:16:07 +08:00 |
gaoxin
|
e308fd0149
|
【主界面】修复update方法不能停止的问题
|
2021-05-24 16:24:16 +08:00 |
wangzhenxing
|
769042a739
|
master_test_gn协议提交
|
2021-05-24 14:14:11 +08:00 |
jiaoyangna
|
8719603f64
|
牛气冲天,福星高照修改
|
2021-05-22 15:20:51 +08:00 |
wangzhenxing
|
9b336aeda9
|
主城报错修改提交
|
2021-05-21 18:13:21 +08:00 |
wangzhenxing
|
cade21c700
|
主城报错修改提交
|
2021-05-21 18:00:25 +08:00 |
zhangqiang
|
d2a53631d6
|
【山河社稷图】提交
|
2021-05-21 16:21:07 +08:00 |
zhangqiang
|
da17fb96ed
|
【主城修改】2
|
2021-05-20 20:32:04 +08:00 |
zhangqiang
|
97ba718ac2
|
Merge branch 'china/dev-c' into china/mainSceneChange
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-05-20 17:32:06 +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 |
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 |
zhangqiang
|
491b7b54a7
|
【化虚坛优化】化虚坛中有可合成的将时,在神将头像、页签按钮,和化虚坛入口上添加红点提示
|
2021-05-19 10:27:55 +08:00 |
jiaoyangna
|
ec8c7ea645
|
成长礼包添加特效
|
2021-05-13 11:30:39 +08:00 |