Commit Graph

1828 Commits (23c17edfc7b7587727399ee8f00c5dd990e71763)

Author SHA1 Message Date
gaoxin d66ee3980d 【战斗】删除上部边框 2021-05-28 13:35:02 +08:00
jiaoyangna b78b006009 神将情报界面修改提交 2021-05-28 12:30:47 +08:00
gaoxin 36240be7e9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 11:23:37 +08:00
gaoxin c76af7fe0b 【左上角图标UI】六星玉帝图标没有置顶 2021-05-28 11:23:10 +08:00
wangzhenxing 560089c1f5 [限时祈愿活动] 预设 协议提交 2021-05-28 10:58:20 +08:00
jiaoyangna 765d58f459 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 22:34:15 +08:00
jiaoyangna a996bbc219 无尽修改提交 2021-05-27 22:34:11 +08:00
gaoxin 95b207e1eb 【每日礼包】一键购买点击无效 2021-05-27 22:24:28 +08:00
zhangqiang b92e659e53 【山河社稷图】特效提交 2021-05-27 20:17:53 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
ZhangBiao 4b2a71c6eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:29:06 +08:00
ZhangBiao dd29682429 【成长礼包】新换的会动的玉皇大帝,后面没背景 2021-05-27 18:28:49 +08:00
gaoxin 9f8858b4f7 【主界面】左上角按钮自动排列 2021-05-27 18:20:32 +08:00
gaoxin 8ebd47a087 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:13:08 +08:00
gaoxin ba4debba7b 【主界面】左上角按钮自动排列 2021-05-27 18:13:03 +08:00
ZhangBiao 6050b780dd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 17:58:02 +08:00
ZhangBiao 45602214d8 【修行】特效增加 2021-05-27 17:57:49 +08:00
gaoxin cb367d4928 【排行榜】界面显示优化 2021-05-27 17:50:30 +08:00
jiaoyangna 666f77c3db 无尽修改提交 2021-05-27 17:34:59 +08:00
ZhangBiao 905e66c471 【公会援助】名字颜色提交 2021-05-27 16:43:59 +08:00
zhangqiang ff837e338e 【山河社稷图小点】预设修改提交 2021-05-27 15:38:44 +08:00
jiaoyangna 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
jiaoyangna a9b52e6834 无尽副本修改提交 2021-05-27 15:16:46 +08:00
gaoxin 417a46815f 【日常副本】资源替换 2021-05-27 14:56:18 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
zhangqiang 0bcd6ade1f 【山河社稷图】bug + 资源 前端得刷资源 2021-05-27 14:06:20 +08:00
gaoxin 19adbf944e 【每日礼包】资源修改 2021-05-27 14:02:53 +08:00
zhangqiang f758982d32 【山河社稷图】跳转 2021-05-27 09:50:11 +08:00
jiaoyangna b197244667 无尽副本修改提交 2021-05-27 09:46:56 +08:00
jiaoyangna 92633b6913 秘宝修改提交 2021-05-26 21:58:48 +08:00
zhangqiang dbee1bef07 【山河社稷图】bug 2021-05-26 20:21:55 +08:00
jiaoyangna 8f6fce191b 无尽任务提交 2021-05-26 18:07:09 +08:00
jiaoyangna 618d8094ea 无尽副本修改提交 2021-05-26 17:27:47 +08:00
zhangqiang 9322a8489a 【提交】 2021-05-26 14:59:25 +08:00
jiaoyangna bb2cd6a263 无尽副本修改提交 2021-05-26 14:57:28 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
ZhangBiao 172f98c207 【修行】玩家界面预览报错修改 2021-05-26 11:28:59 +08:00
ZhangBiao d7cda43ed0 【主界面】右上伸缩条调整 2021-05-26 11:16:27 +08:00
ZhangBiao f3cf294f42 【主界面】右上伸缩条首充引导调整,修行调整 2021-05-26 10:16:24 +08:00
jiaoyangna 911f443e40 添加属性提升 2021-05-26 09:51:41 +08:00
ZhangBiao f38620058c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 21:09:43 +08:00
ZhangBiao 9e6dc29cb9 【主界面】右上伸缩条红点 2021-05-25 21:08:48 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00
ZhangBiao d835687e8c 【主城】伸缩条调整 2021-05-25 18:33:26 +08:00
ZhangBiao d41ba9f65d 【主城】右侧伸缩条 2021-05-25 18:21:52 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
zhangqiang dfa198081a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 14:51:58 +08:00
zhangqiang a1c4a6aa5c 【心魔】 + 山河社稷图修改 2021-05-25 14:51:26 +08:00
ZhangBiao 41152acae9 【修行】排行榜界面,神将界面、神将替换提示调整 2021-05-25 11:54:19 +08:00
jiaoyangna 4a5dc61add Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:32:54 +08:00
jiaoyangna bec733c9d6 预设提交 2021-05-25 10:32:42 +08:00
gaoxin 289a75c741 【挂机】修复挂机帮助和vip任务重叠的问题 2021-05-25 10:31:44 +08:00
ZhangBiao a22a984c61 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:16:17 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +08:00
jiaoyangna c9c5480484 福星高照 提交 2021-05-25 10:07:31 +08:00
jiaoyangna 40fcabaf55 牛气冲天 提交 2021-05-24 20:26:53 +08:00
jiaoyangna 1d11aeb1b0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 19:50:38 +08:00
jiaoyangna b36d04f7d7 牛气冲天 修改 2021-05-24 19:50:21 +08:00
gaoxin 23001be1b4 【战斗】跳过优化 2021-05-24 19:20:22 +08:00
ZhangBiao 6294f34149 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 16:38:41 +08:00
ZhangBiao 43a817235f 【修行】英雄选择附身中 2021-05-24 16:38:30 +08:00
gaoxin 6d9f8f2f3d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 15:44:17 +08:00
gaoxin d37728e374 【配置】修复公告兑换码不显示的问题 2021-05-24 15:44:10 +08:00
ZhangBiao 6f27423920 【修行】提交 2021-05-24 14:58:00 +08:00
jiaoyangna c68da98b84 Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 14:43:42 +08:00
jiaoyangna 1f914e4ae9 预设提交 2021-05-24 14:40:54 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
ZhangBiao 04140ca1f2 【修行】神印按钮条件 2021-05-24 13:48:07 +08:00
ZhangBiao d9b465c7cf 【修行】英雄选择界面修改 2021-05-24 12:02:20 +08:00
ZhangBiao dade783281 【修行】英雄选择界面修改 2021-05-24 11:53:44 +08:00
jiaoyangna a10ec722e5 无尽副本提交 2021-05-24 11:51:11 +08:00
ZhangBiao 82a0370730 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 11:22:07 +08:00
ZhangBiao 70729ca2d0 【修行】增加红点 2021-05-24 11:21:56 +08:00
jiaoyangna 4ced80cf6a 福星高照,牛气冲天 提交 2021-05-24 11:08:16 +08:00
ZhangBiao daf5a675f8 【修行】预览界面资源添加 2021-05-22 18:52:49 +08:00
ZhangBiao b64e85bc2c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-22 18:20:14 +08:00
ZhangBiao 165ad7a2de 【修行】提交 2021-05-22 18:20:07 +08:00
jiaoyangna 3bd06ba84b 【主题活动】活动商店背景图不正确,需要统一,类似社稷大典或乾坤宝盒商店这些商店等。 2021-05-22 17:17:43 +08:00
zhangqiang e404e26ffa 【山河社稷图】 2021-05-22 15:55:14 +08:00
jiaoyangna 7cc12e74a8 无尽修改提交 2021-05-22 14:08:34 +08:00
zhangqiang cb86e3efd4 【山河社稷图】 2021-05-21 19:07:46 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
zhangqiang 016667ef7e 【战斗背景音乐】 山河社稷图入口文字 2021-05-21 16:38:20 +08:00
zhangqiang d2a53631d6 【山河社稷图】提交 2021-05-21 16:21:07 +08:00
gaoxin 24e02b07c6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-21 15:31:48 +08:00
gaoxin f6067f4402 【战斗】跳过优化 2021-05-21 15:31:40 +08:00
zhangqiang 4aaa6b29de 【山河社稷图】入口 + 特权修改 2021-05-21 15:29:14 +08:00
wangzhenxing db3b58ea8e 合并冲突提交 2021-05-21 15:05:09 +08:00
wangzhenxing 6ab70e6e8d 【功能】==========公会红包 2021-05-21 14:47:04 +08:00
zhangqiang 1ed6cbaad0 【山河社稷图】替换新资源 2021-05-21 14:37:09 +08:00
gaoxin 006eae4bd9 【死灵试炼】资源及相关代码导入,但代码未使用 2021-05-21 13:45:10 +08:00
gaoxin e72d1ee9c0 【挂机】优化跳转 2021-05-21 11:01:37 +08:00
zhangqiang da17fb96ed 【主城修改】2 2021-05-20 20:32:04 +08:00
ZhangBiao abcc89c68f 【修行】选择神将从generalpopup到bigpopup 2021-05-20 20:23:22 +08:00
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
gaoxin 3007dafa27 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 14:37:05 +08:00
gaoxin 0bc7a1d3e8 【资源】修复新增spine动画的动作问题 2021-05-20 14:36: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
gaoxin c32e9a1007 【资源】新增立绘 资源 2021-05-18 17:47:47 +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