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 |
zhangqiang
|
57e1e32e32
|
【山河社稷图】提交
|
2021-05-14 15:03:48 +08:00 |
ZhangBiao
|
b3e40bac95
|
【修行】提交
|
2021-05-14 14:54:57 +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 |
jiaoyangna
|
fac4b21c6b
|
活动结束报错修改
|
2021-05-14 13:21:01 +08:00 |
jiaoyangna
|
3905116205
|
活动结束 修改提交
(cherry picked from commit 5018ba2d9b)
|
2021-05-14 13:14:12 +08:00 |
gaoxin
|
519a12a214
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-14 10:36:57 +08:00 |
gaoxin
|
112f7b551d
|
【活动】所有tab图片都设置为正常大小
|
2021-05-14 10:36:51 +08:00 |
jiaoyangna
|
0a18fd2c77
|
刷新修改
|
2021-05-14 09:59:11 +08:00 |
zhangqiang
|
364ce0526b
|
【山河社稷图】提交
|
2021-05-13 22:50:34 +08:00 |
jiaoyangna
|
acffbdc9e1
|
跳过按钮修改
|
2021-05-13 21:15:24 +08:00 |
jiaoyangna
|
4e05a30da5
|
活动界面点击点金 刷新
|
2021-05-13 21:06:45 +08:00 |
ZhangBiao
|
4b20254ddd
|
【修行】提交
|
2021-05-13 21:03:27 +08:00 |
jiaoyangna
|
d08e051590
|
神医天降任务重叠修改
|
2021-05-13 21:01:35 +08:00 |
jiaoyangna
|
bc1a22a1f9
|
跳转提交
|
2021-05-13 20:59:29 +08:00 |
jiaoyangna
|
1732d1e2db
|
红点变灰修改 剩余时间文字描述修改
|
2021-05-13 20:31:47 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
jiaoyangna
|
138f3d2ff1
|
时间修改
|
2021-05-13 20:17:02 +08:00 |
jiaoyangna
|
22eeef86f3
|
灵兽特惠修改提交
|
2021-05-13 19:46:50 +08:00 |
jiaoyangna
|
3b72644446
|
乾坤宝盒提交
|
2021-05-13 18:28:51 +08:00 |
jiaoyangna
|
b7dbc1919a
|
乾坤宝盒预设修改
|
2021-05-13 18:17:41 +08:00 |
jiaoyangna
|
de6d728dd4
|
乾坤宝盒描述修改
|
2021-05-13 18:04:35 +08:00 |
jiaoyangna
|
efdd57a103
|
修改描述
|
2021-05-13 18:00:35 +08:00 |
jiaoyangna
|
7e4287b701
|
删除查看祥情按钮
(cherry picked from commit e6582cf97f)
|
2021-05-13 17:55:45 +08:00 |
jiaoyangna
|
702a0202f7
|
主题活动任务修改
(cherry picked from commit f4c39cd6c1)
|
2021-05-13 17:55:40 +08:00 |
jiaoyangna
|
e6582cf97f
|
删除查看祥情按钮
|
2021-05-13 17:54:45 +08:00 |
ZhangBiao
|
8df2338780
|
【修行】提交
|
2021-05-13 17:37:47 +08:00 |
jiaoyangna
|
f4c39cd6c1
|
主题活动任务修改
|
2021-05-13 17:05:55 +08:00 |
gaoxin
|
84506a3141
|
【红包】取消红包发送后的tip提示
|
2021-05-13 14:22:27 +08:00 |
jiaoyangna
|
ed41c4cf3c
|
成长礼包
|
2021-05-13 11:52:04 +08:00 |
wangzhenxing
|
b192d75b07
|
【战斗】=====被动去log
|
2021-05-13 11:34:25 +08:00 |
jiaoyangna
|
ec8c7ea645
|
成长礼包添加特效
|
2021-05-13 11:30:39 +08:00 |
wangzhenxing
|
501140fa52
|
[战斗]=========被动增加 316-321
|
2021-05-13 11:24:35 +08:00 |
jiaoyangna
|
6556a240e4
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-13 10:53:12 +08:00 |
jiaoyangna
|
c4cf95921f
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-13 10:50:38 +08:00 |
jiaoyangna
|
f2dd955ea8
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-13 10:46:41 +08:00 |
zhangqiang
|
da33b98dfb
|
【山河社稷图】提交
|
2021-05-13 09:56:11 +08:00 |
jiaoyangna
|
c66b323044
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-12 21:05:36 +08:00 |
ZhangBiao
|
98e4de79b2
|
【修行】提交
|
2021-05-12 20:53:34 +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 |
jiaoyangna
|
20b5ded8e9
|
修改add 为addOnce
(cherry picked from commit 14b1420d14)
|
2021-05-12 17:42:51 +08:00 |
jiaoyangna
|
5817146b6f
|
主题活动修改提交
(cherry picked from commit 0b5177748b)
|
2021-05-12 17:41:19 +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
|
5eed825a7c
|
活动主界面修改提交
(cherry picked from commit 3fffdd9cd3)
|
2021-05-12 17:38:12 +08:00 |
jiaoyangna
|
3c04e8dbe1
|
[主题活动修改提交]
(cherry picked from commit f88ccd8f68)
|
2021-05-12 17:37:59 +08:00 |
jiaoyangna
|
778f2360a7
|
【幸运探宝优化】界面显示规则优化
|
2021-05-12 17:07:43 +08:00 |
jiaoyangna
|
1e83996522
|
【活动优化】百宝商会增加一键购买,礼包金额及奖励变更
|
2021-05-12 15:25:54 +08:00 |
jiaoyangna
|
14b1420d14
|
修改add 为addOnce
|
2021-05-12 14:38:45 +08:00 |
jiaoyangna
|
71f42b1526
|
添加表
|
2021-05-12 13:55:08 +08:00 |
jiaoyangna
|
c54c0b547d
|
服务器状态错误添加容错
|
2021-05-12 13:53:06 +08:00 |
jiaoyangna
|
214c971c41
|
Merge branch '0活动开发聚集地/new主题活动' into china/dev-c
|
2021-05-12 11:21:28 +08:00 |
jiaoyangna
|
e9d548d5b6
|
【活动优化】每日豪礼界面优化调整
|
2021-05-12 11:16:33 +08:00 |
jiaoyangna
|
4c41ca0572
|
音效提交
(cherry picked from commit 5a19a26d943af8465f22614548083da158ee8c85)
|
2021-05-12 11:07:44 +08:00 |
jiaoyangna
|
0843bb8c4e
|
音效提交
(cherry picked from commit 44cc010a8a26b372fefd28e09414bfa641e90100)
|
2021-05-12 11:07:36 +08:00 |
jiaoyangna
|
16a67e5190
|
【活动优化】每日豪礼界面优化调整
|
2021-05-12 10:47:48 +08:00 |
ZhangBiao
|
92b22fdc0c
|
【修行】提交
|
2021-05-12 10:35:58 +08:00 |
zhangqiang
|
1ed38be14a
|
【山河社稷图】提交
|
2021-05-11 20:20:38 +08:00 |
ZhangBiao
|
7ba5209394
|
【修行】提交
|
2021-05-11 17:23:19 +08:00 |
wangzhenxing
|
32d592b7bc
|
[战斗]====精英副本相关修改提交
|
2021-05-11 17:05:11 +08:00 |
gaoxin
|
b7b3f610ed
|
【翻译文字导出】
|
2021-05-11 17:03:09 +08:00 |
jiaoyangna
|
dc66043a06
|
【活动优化】百宝商会增加一键购买,礼包金额及奖励变更
|
2021-05-11 16:59:48 +08:00 |
zhangqiang
|
410f679e68
|
【山河社稷图】提交
|
2021-05-11 16:58:01 +08:00 |
zhangqiang
|
effe90990f
|
【山河社稷图】提交
|
2021-05-11 15:12:37 +08:00 |
ZhangBiao
|
7104d77d7e
|
【修行】开坑
|
2021-05-11 15:09:25 +08:00 |
jiaoyangna
|
0b5177748b
|
主题活动修改提交
|
2021-05-11 14:59:41 +08:00 |
ZhangBiao
|
e167fbbc1b
|
【灵兽宝阁】概率公示描述优化
|
2021-05-11 13:50:42 +08:00 |
ZhangBiao
|
7ec3ae01f6
|
【升级限量礼包】无剩余礼包逻辑缺失修复
|
2021-05-11 10:08:09 +08:00 |
jiaoyangna
|
847adfc761
|
主题活动提交
|
2021-05-10 20:20:20 +08:00 |
ZhangBiao
|
165c8650a7
|
【恭喜获得】背包已满会弹空的恭喜获得2
|
2021-05-10 16:20:41 +08:00 |
ZhangBiao
|
181306059d
|
【恭喜获得】背包已满会弹空的恭喜获得
|
2021-05-10 16:12:09 +08:00 |
gaoxin
|
b4834ba2cc
|
【图鉴】信息界面定位按钮走表配置
|
2021-05-10 10:57:06 +08:00 |
jiaoyangna
|
3fffdd9cd3
|
活动主界面修改提交
|
2021-05-10 10:52:44 +08:00 |
ZhangBiao
|
16e5b894e3
|
【天尊降世】增加第三个奖励红点
|
2021-05-10 10:35:08 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +08:00 |
ZhangBiao
|
1c9ae3884b
|
【花虚坛】置换界面空白修复
|
2021-05-08 14:31:35 +08:00 |
ZhangBiao
|
40bc700f65
|
【累充】周刷新的累充,页签会显示每日累充
|
2021-05-08 12:01:18 +08:00 |
ZhangBiao
|
b88d05061c
|
【点金达人】在活动界面跳转点金,需要切换页签,次数才会刷新
|
2021-05-08 11:45:05 +08:00 |
ZhangBiao
|
9fda08c7ba
|
【碎片合成】神将达上限,选择合成数量时没有合理提示
|
2021-05-08 11:03:46 +08:00 |
zhangqiang
|
1745c20ab0
|
【山河社稷图】提交
|
2021-05-07 20:24:41 +08:00 |
jiaoyangna
|
fb51497d38
|
主题活动提交
|
2021-05-07 18:05:09 +08:00 |
jiaoyangna
|
25cfb730b6
|
灵兽特惠提交
|
2021-05-07 17:49:23 +08:00 |
jiaoyangna
|
21e5c3b78d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-07 17:01:34 +08:00 |
jiaoyangna
|
dd862760cd
|
图片修改提交
|
2021-05-07 17:00:54 +08:00 |
ZhangBiao
|
bad91c3b25
|
【月卡】月卡界面关闭后报错修改
|
2021-05-07 16:39:23 +08:00 |
ZhangBiao
|
02be5bb730
|
【森罗幻境】boss不生成修改
|
2021-05-07 15:10:06 +08:00 |
zhangqiang
|
1db33218d8
|
【山河社稷图】首提
|
2021-05-07 14:44:50 +08:00 |
ZhangBiao
|
782588b1ef
|
【森罗幻境】修复打boss弹出恭喜获得弹窗
|
2021-05-07 11:43:37 +08:00 |
jiaoyangna
|
c6a5a7ce01
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-07 11:02:14 +08:00 |
jiaoyangna
|
ff8b9b57cc
|
限时up 提交
|
2021-05-07 11:01:33 +08:00 |
ZhangBiao
|
04e3fec068
|
【灵兽宝阁】有免费抽的时候不显示倒计时
|
2021-05-07 10:55:04 +08:00 |
jiaoyangna
|
8e44dca9b5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-06 18:22:48 +08:00 |
jiaoyangna
|
885c8bc53c
|
限时兑换在两个活动里出现修改
|
2021-05-06 18:22:15 +08:00 |
zhangqiang
|
601f5c09b9
|
【拍脸】修改
|
2021-05-06 18:08:53 +08:00 |
jiaoyangna
|
7ec568e48d
|
新添加主题活动限时兑换跳转
|
2021-05-06 17:49:43 +08:00 |
gaoxin
|
d574d2ee2a
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-30 16:36:09 +08:00 |
jiaoyangna
|
412a4ec851
|
没有找到剧情继续执行,不卡死
|
2021-04-30 16:13:00 +08:00 |