wangzhenxing
|
769042a739
|
master_test_gn协议提交
|
2021-05-24 14:14:11 +08:00 |
gaoxin
|
acc2609df6
|
【本地化】公告
|
2021-05-24 14:09:11 +08:00 |
ZhangBiao
|
fa051b65dc
|
【修行】QA增加
|
2021-05-24 13:58:30 +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 |
ZhangBiao
|
040f83f370
|
【修行】红点调整
|
2021-05-24 11:34:50 +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 |
zhangqiang
|
e404e26ffa
|
【山河社稷图】
|
2021-05-22 15:55:14 +08:00 |
zhangqiang
|
a30616a9fc
|
【山河社稷图】修改
|
2021-05-22 15:26:30 +08:00 |
jiaoyangna
|
8719603f64
|
牛气冲天,福星高照修改
|
2021-05-22 15:20:51 +08:00 |
zhangqiang
|
cb86e3efd4
|
【山河社稷图】
|
2021-05-21 19:07:46 +08:00 |
wangzhenxing
|
d95768226b
|
红包红点显示修改
|
2021-05-21 18:18:53 +08:00 |
wangzhenxing
|
9b336aeda9
|
主城报错修改提交
|
2021-05-21 18:13:21 +08:00 |
wangzhenxing
|
cade21c700
|
主城报错修改提交
|
2021-05-21 18:00:25 +08:00 |
wangzhenxing
|
ead8668479
|
福利红包修改提交
|
2021-05-21 17:32:52 +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
|
f15fbf6576
|
【探宝】物品置灰后不再显示光效
|
2021-05-21 14:14:09 +08:00 |
gaoxin
|
3f59300826
|
【挂机】修复vip任务刷新不及时的问题
|
2021-05-21 13:55:40 +08:00 |
gaoxin
|
006eae4bd9
|
【死灵试炼】资源及相关代码导入,但代码未使用
|
2021-05-21 13:45:10 +08:00 |
gaoxin
|
a8c8d08775
|
【挂机】优化挂机界面vip任务显示
|
2021-05-21 11:57:59 +08:00 |
gaoxin
|
e72d1ee9c0
|
【挂机】优化跳转
|
2021-05-21 11:01:37 +08:00 |
gaoxin
|
aecc6eb692
|
【特权优化】特权任务在关卡界面增加快捷入口
|
2021-05-20 21:00:29 +08:00 |
zhangqiang
|
da17fb96ed
|
【主城修改】2
|
2021-05-20 20:32:04 +08:00 |
zhangqiang
|
2d4ecc8c04
|
Merge branch 'china/dev-c' into china/mainSceneChange
|
2021-05-20 20:29:41 +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
|
e51378ab3b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 18:00:53 +08:00 |
ZhangBiao
|
46cc1d9591
|
【修行】限制特权入口,增加仙尘加号
|
2021-05-20 18:00:45 +08:00 |
zhangqiang
|
02b3f94761
|
【首领关卡】不允许跳过提示修改
|
2021-05-20 17:50:44 +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 |
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
|
243240d803
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 16:51:34 +08:00 |
gaoxin
|
239f8c50e4
|
【社稷大典】奖励提示添加
|
2021-05-20 16:51:09 +08:00 |
zhangqiang
|
4b2259d65a
|
【山河社稷图】加副关卡编队
|
2021-05-20 16:46:26 +08:00 |
gaoxin
|
6f0132e18d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 16:12:20 +08:00 |
gaoxin
|
bd27d190ac
|
【屏幕适配】部分界面优化
|
2021-05-20 16:12:15 +08:00 |
zhangqiang
|
fc1dc60119
|
【特权加等级奖励】4
|
2021-05-20 16:11:18 +08:00 |
zhangqiang
|
90bba41910
|
【特权加等级奖励】3
|
2021-05-20 15:47:15 +08:00 |
gaoxin
|
16596f733d
|
【竞技场】免费次数提示添加
|
2021-05-20 14:59:40 +08:00 |
zhangqiang
|
80183cd5a0
|
【特权加等级奖励】1
|
2021-05-20 14:18:48 +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
|
3f7e243b70
|
【修行】this.spLoader提交
|
2021-05-20 09:48:52 +08:00 |
ZhangBiao
|
2870091514
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-19 20:53:37 +08:00 |
zhangqiang
|
189ed98688
|
【拍脸灵兽推送礼包】
|
2021-05-19 20:40:33 +08:00 |
gaoxin
|
11c0d5f2a5
|
【引导】修复不明原因引导小手消失的问题
|
2021-05-19 20:21:07 +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
|
a93b2391e6
|
【修行】提交
|
2021-05-19 19:53:00 +08:00 |
ZhangBiao
|
7d5de9d23a
|
【修行】恭喜破镜
|
2021-05-19 18:27:57 +08:00 |
zhangqiang
|
029ea47266
|
【山河社稷图】图片加载
|
2021-05-19 17:36:43 +08:00 |
gaoxin
|
417dcbf116
|
【bug】修复幸运探宝界面打不开的wenti
|
2021-05-19 17:26:50 +08:00 |
ZhangBiao
|
3bb85fd5db
|
【修行】新增通用恭喜界面
|
2021-05-19 16:56:49 +08:00 |
ZhangBiao
|
e491f58adc
|
【修行】提交
|
2021-05-19 16:14:09 +08:00 |
gaoxin
|
5f7aaf6a57
|
【公告】修复界面销毁后再打开报错的问题
|
2021-05-19 16:05:29 +08:00 |
zhangqiang
|
ebcc753925
|
【山河社稷图】小关卡等级限制提示
|
2021-05-19 15:53:23 +08:00 |
gaoxin
|
a856603686
|
【降妖夺宝】修复图片加载器错误
|
2021-05-19 15:24:14 +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
|
6d551869be
|
【内存优化】新内存内存优化修改
|
2021-05-19 15:06:02 +08:00 |
ZhangBiao
|
d2e6f593be
|
【修行】小点提交
|
2021-05-19 14:46:51 +08:00 |
gaoxin
|
d84db1977d
|
【优化】删除一些log,修复一些合并代码产生的错误
|
2021-05-19 14:37:08 +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
|
7a1894e75e
|
累计充值修改提交
|
2021-05-19 10:56:30 +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
|
15c655cbf5
|
日常副本提交
|
2021-05-19 09:55:28 +08:00 |
jiaoyangna
|
a8f3377bc3
|
删除log
|
2021-05-18 21:15:18 +08:00 |
jiaoyangna
|
3cf21f5e85
|
30、68元档位奖励图标及特效框需同时出现,效果同首次点击18元档位展示效果即可
|
2021-05-18 21:14:22 +08:00 |
jiaoyangna
|
deeaa0221d
|
每日礼包界面内,点击妖晶快捷获取按钮,再点击商店,商店内点击妖晶快捷获取,退出时会重复显示界面的bug;
|
2021-05-18 21:04:58 +08:00 |
ZhangBiao
|
9b1c6ac930
|
【修行】资源提交
|
2021-05-18 21:00:38 +08:00 |
jiaoyangna
|
83697a9de4
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-18 20:53:23 +08:00 |
jiaoyangna
|
b6b5599812
|
“稀有”角标美术资源替换
|
2021-05-18 20:36:43 +08:00 |
jiaoyangna
|
e70c9eb751
|
福星高照提交
|
2021-05-18 20:22:26 +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
|
2703f3e4f2
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 + 战斗背景音乐替换
|
2021-05-18 17:18:52 +08:00 |
zhangqiang
|
d36dfd9e25
|
【山河社稷图】是否通关
|
2021-05-18 16:51:43 +08:00 |
zhangqiang
|
c4865509b3
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 2
|
2021-05-18 16:41:48 +08:00 |
gaoxin
|
d084904f33
|
【公告】修改公告通道的配置位置
|
2021-05-18 16:19:36 +08:00 |
ZhangBiao
|
bcf845ae38
|
【修行】玩家信息界面怎加技能详情
|
2021-05-18 16:13:26 +08:00 |
zhangqiang
|
3686c2a75f
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过
|
2021-05-18 15:58:44 +08:00 |
gaoxin
|
5c8ee62e42
|
【公告】添加空值判段
|
2021-05-18 15:53:44 +08:00 |
gaoxin
|
2b693b417e
|
【跳转】活动跳转添加开启判断
|
2021-05-18 15:50:17 +08:00 |
gaoxin
|
1da9223506
|
【公告】修改公告的字段名,version工具添加公告配置
|
2021-05-18 15:37:37 +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 |
zhangqiang
|
433bcf9ddb
|
【添加音效】
|
2021-05-18 14:24:09 +08:00 |
jiaoyangna
|
ae913260f8
|
18、30、68元档位切换按钮,可触碰区域加大
|
2021-05-18 11:44:51 +08:00 |
gaoxin
|
8ed3371932
|
【限时召唤】修复左上角奖励领取报错
|
2021-05-18 11:42:47 +08:00 |
zhangqiang
|
be1b1698b5
|
【山河社稷图】提交
|
2021-05-17 20:08:33 +08:00 |
ZhangBiao
|
1086f182a0
|
【修行】提交
|
2021-05-17 19:49:48 +08:00 |
zhangqiang
|
32eace4be7
|
【山河社稷图】一键上阵修改
|
2021-05-17 19:34:23 +08:00 |
zhangqiang
|
fae85fc903
|
【魂印图鉴修改】
|
2021-05-17 18:24:47 +08:00 |
ZhangBiao
|
d0d20db65b
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 17:57:45 +08:00 |
ZhangBiao
|
1ee46493ab
|
【修行】上方玩家名字颜色修改
|
2021-05-17 17:56:23 +08:00 |
zhangqiang
|
d1e27ccdc3
|
【山河社稷图】编队bug
|
2021-05-17 17:54:21 +08:00 |
ZhangBiao
|
0fa0f251ba
|
【修行】巅峰赛名字颜色修改
|
2021-05-17 17:42:08 +08:00 |
ZhangBiao
|
8e1b42c0ac
|
【修行】名字颜色修改
|
2021-05-17 17:28:37 +08:00 |
ZhangBiao
|
8d2a0a86aa
|
【修行】战斗卡住提交
|
2021-05-17 16:04:39 +08:00 |
gaoxin
|
e76fb1dede
|
【社稷大典】修复未加入公会时,取消无限循环的问题
|
2021-05-17 15:49:59 +08:00 |
ZhangBiao
|
d53415d80b
|
【修行】名字颜色
|
2021-05-17 15:48:41 +08:00 |
zhangqiang
|
f6fb0c2071
|
【山河社稷图】宝箱奖励预览
|
2021-05-17 15:39:08 +08:00 |
ZhangBiao
|
ffd695f3b1
|
【修行】名字提交
|
2021-05-17 15:20:20 +08:00 |
ZhangBiao
|
58e7cea17e
|
【修行】名字颜色提交
|
2021-05-17 14:34:37 +08:00 |
ZhangBiao
|
10481bc650
|
【修行】名字颜色修改
|
2021-05-17 14:15:55 +08:00 |
ZhangBiao
|
2b81c437e8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-17 11:58:06 +08:00 |
ZhangBiao
|
beb2d5b56c
|
【修行】提交
|
2021-05-17 11:57:54 +08:00 |
zhangqiang
|
5b4be5ef37
|
【山河社稷图】战斗回放提示
|
2021-05-17 11:55:34 +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
|
c5df85efae
|
【修行】提交
|
2021-05-17 10:54:36 +08:00 |
ZhangBiao
|
8003c43f71
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 10:32:30 +08:00 |
ZhangBiao
|
5fe75af0bf
|
Merge branch 'china/dev' into 0功能/修行玩法
|
2021-05-17 10:15:42 +08:00 |
ZhangBiao
|
b13dabcad2
|
【修行】提交
|
2021-05-17 09:50:32 +08:00 |
gaoxin
|
533fd17972
|
【公会】满级显示添加
|
2021-05-15 18:03:25 +08:00 |
gaoxin
|
02649f00ca
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-15 17:40:21 +08:00 |
gaoxin
|
eac86d749f
|
【gm】引导测试功能优化
|
2021-05-15 17:38:58 +08:00 |
gaoxin
|
8e1da10b52
|
【剧情】注释打开
|
2021-05-15 17:06:04 +08:00 |
jiaoyangna
|
3c0131d7b1
|
每日豪礼修改提交
|
2021-05-15 16:46:08 +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 |
zhangqiang
|
78e1a2b5a4
|
【山河社稷图】提交
|
2021-05-15 16:16:46 +08:00 |
jiaoyangna
|
269d1c4ae7
|
每日豪礼修改提交
|
2021-05-15 16:14:39 +08:00 |
gaoxin
|
96e08c7025
|
【红包】提示文字修改
|
2021-05-15 16:07:45 +08:00 |
gaoxin
|
502eb112c0
|
【红包】删除红包购买提示
|
2021-05-15 15:50:52 +08:00 |
jiaoyangna
|
58b2beb015
|
文字曲线提交
|
2021-05-15 15:39:53 +08:00 |
zhangqiang
|
9ccd6f9002
|
【车迟斗法】倒计时问题
|
2021-05-15 14:40:43 +08:00 |
zhangqiang
|
54fa0110e5
|
【山河社稷图】提交
|
2021-05-15 13:49:18 +08:00 |
zhangqiang
|
11f17fca87
|
【山河社稷图】提交
|
2021-05-14 19:55:28 +08:00 |
jiaoyangna
|
896a52a6a1
|
乾坤宝盒弹窗提交
|
2021-05-14 19:06:12 +08:00 |
wangzhenxing
|
bcc175ea8f
|
【战斗】==========被动107 被动321 修改
|
2021-05-14 17:48:57 +08:00 |
ZhangBiao
|
87f18cb049
|
【修行】提交
|
2021-05-14 17:48:47 +08:00 |
zhangqiang
|
5292b1441b
|
【山河社稷图】提交
|
2021-05-14 16:44:40 +08:00 |
jiaoyangna
|
c62a293740
|
结束修改
|
2021-05-14 16:02:14 +08:00 |