Commit Graph

677 Commits (ff7e9e9e85f114da971b39ceac0429599f1167b1)

Author SHA1 Message Date
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
jiaoyangna 404a30a57d 四灵修改提交 2021-08-25 15:15:50 +08:00
zhangqiang dd37961be0 【跨服十绝阵】 回退特殊处理 2021-08-25 13:53:40 +08:00
ZhangBiao bd7383f063 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 16:47:26 +08:00
jiaoyangna ca656636ac 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:09:43 +08:00
ZhangBiao 2612c2e01e Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-08-17 19:53:05 +08:00
jiaoyangna faf7591cf5 玲珑宝镜修改 2021-08-17 17:14:03 +08:00
ZhangBiao fab5388536 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-08-17 13:47:27 +08:00
zhangqiang 617d4d39c3 【十绝阵】排行榜修改 2021-08-13 16:35:33 +08:00
ZhangBiao 6e9136aa14 【寻宝密宗】增加QA 2021-08-10 16:17:28 +08:00
ZhangBiao d017873b79 【寻宝迷踪】提交 2021-08-10 15:27:32 +08:00
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
ZhangBiao 4edc9a855b 【寻宝迷踪】提交 2021-08-05 17:23:25 +08:00
ZhangBiao 1c0880abbf 【寻宝迷踪】 2021-08-05 14:31:31 +08:00
ZhangBiao 87cf2102fe 【寻宝迷踪】添加资源 2021-08-04 18:16:36 +08:00
ZhangBiao 28b794eea2 【寻宝迷踪】开坑 2021-08-03 10:27:36 +08:00
zhangqiang acf647d9c5 【罗浮争锋】 2021-07-31 17:20:07 +08:00
zhangqiang c11d9849fd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-07-29 16:38:35 +08:00
zhangqiang 9c28f232f6 【跨服排行榜】 2021-07-29 16:35:58 +08:00
gaoxin 1b3e5c196b 【跨服聊天】完善跨服聊天角色信息显示 2021-07-29 11:46:59 +08:00
gaoxin 381d537a4e 【登录】除流畅,拥挤和爆满外的其他状态全部不可进入游戏 2021-07-29 11:44:35 +08:00
gaoxin e552db5499 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:43:04 +08:00
gaoxin ef78e0ae21 【跨服聊天】添加跨服聊天频道 2021-07-28 17:42:58 +08:00
wangzhenxing ef714577e8 [bug]========称号显示修改 2021-07-28 16:10:58 +08:00
zhangqiang 71f7e8a469 Merge branch 'china/dev' into china/jumpserver
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-27 11:26:30 +08:00
ZhangBiao b910dcfc6f 【主题活动商店】增加商店类型 2021-07-24 16:30:19 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
DESKTOP-98AVA47\Administrator 022681face 红点修改提交 2021-07-23 11:36:44 +08:00
wangzhenxing d0d533cecc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 11:08:03 +08:00
wangzhenxing f7029c2ef0 [功能]==============15日登陆添加 预告 2021-07-23 11:07:46 +08:00
ZhangBiao a33be944cc 【万象商会】提交 2021-07-22 19:53:25 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
jiaoyangna 740592309d 【ID1017508】
【点将台】道具足够10连抽时,10连按钮没有红点
2021-07-21 11:22:56 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
zhangqiang 99cad10435 【跨服天梯】国内提交+1 2021-07-19 15:49:48 +08:00
jiaoyangna 61a2da78cd 超值基金跳转 2021-07-19 11:48:41 +08:00
jiaoyangna 4f0f69b17e 玲珑报警 2021-07-16 17:41:56 +08:00
DESKTOP-98AVA47\Administrator 18cc7ec6a4 红点报错修改提交 2021-07-15 19:20:20 +08:00
DESKTOP-98AVA47\Administrator 695a61abaa Merge branch '0优化/主题活动' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-07-15 18:52:59 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
DESKTOP-98AVA47\Administrator 36f04065fc Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-15 12:59:20 +08:00
ZhangBiao bc55cf3a19 Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-14 18:08:46 +08:00
wangzhenxing ca95dcb71e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 18:05:56 +08:00
wangzhenxing 070fabb0a6 [乾坤宝盒]=========添加常量 2021-07-14 18:05:37 +08:00
jiaoyangna a8fd256812 ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit 53e0f1adcc)
2021-07-14 16:59:59 +08:00
jiaoyangna 047c5c26f7 globaldefine冲突修改 2021-07-14 16:59:03 +08:00
jiaoyangna 53e0f1adcc ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-14 12:04:37 +08:00
ZhangBiao c8b8a84d47 【山河试炼】差红点检测 2021-07-14 11:36:33 +08:00
ZhangBiao 227def7404 【山河试炼】代码提交 2021-07-14 11:33:33 +08:00
jiaoyangna 9f4d456004 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-13 17:25:21 +08:00
zhangqiang 5162b3247c 【跨服天梯】国内提交+1 2021-07-13 11:28:36 +08:00
jiaoyangna f710e20c60 抽卡红点提交 2021-07-10 18:12:50 +08:00
jiaoyangna 1ead3c126d 抽卡红点提交 2021-07-10 14:56:28 +08:00
jiaoyangna 30ab410f00 抽卡优化 2021-07-08 18:40:43 +08:00
jiaoyangna 13905916d1 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 16:48:59 +08:00
zhangqiang de844aea18 【缥缈之旅】提交5 2021-07-03 19:23:15 +08:00
zhangqiang fbda34d678 Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-07-03 16:53:42 +08:00
zhangqiang 2f269ebfa8 【缥缈之旅】提交2 2021-07-03 12:37:56 +08:00
zhangqiang 1be2dc60eb 【缥缈之旅】提交1 2021-07-01 20:13:47 +08:00
ZhangBiao 3b674faa07 Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 15:44:19 +08:00
zhangqiang deb6eeca03 【跳转】增加惊喜礼盒跳转 2021-07-01 15:01:57 +08:00
ZhangBiao 47f6335b55 Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 14:44:48 +08:00
jiaoyangna bb9b58d489 Merge branch '0功能/神将来源' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-06-30 19:57:49 +08:00
jiaoyangna 349404d50e 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 19:28:43 +08:00
ZhangBiao 555ccd253f 【特惠神装】提交 2021-06-30 18:38:20 +08:00
ZhangBiao 00ad684deb 【心愿抽卡】QA 2021-06-30 13:51:47 +08:00
ZhangBiao 04d4f6a5c3 【特惠神装】开坑 2021-06-30 13:26:34 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
ZhangBiao 69581dcaa1 【心愿抽卡】开坑 2021-06-29 11:30:26 +08:00
jiaoyangna 10e4552c4f Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-06-28 10:31:22 +08:00
jiaoyangna de4bcd80b5 ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-26 15:15:19 +08:00
zhangqiang 71540fcfd2 【跨服天梯】国内提交1 2021-06-25 15:23:55 +08:00
jiaoyangna 234f3cb48f ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-23 18:51:35 +08:00
jiaoyangna 15361c2ef5 大圣跳转 2021-06-19 17:07:17 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
jiaoyangna 09095e5b16 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
2021-06-18 11:08:40 +08:00
jiaoyangna 5c09522231 Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:19:27 +08:00
jiaoyangna 4f115efb05 活动提交 2021-06-17 17:18:42 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
jiaoyangna 6f5cd1d44a 惊喜礼包推送 2021-06-17 15:21:22 +08:00
jiaoyangna b1e3d0a163 Merge branch '0功能/升星预览' into china/dev-c 2021-06-17 15:05:03 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
jiaoyangna b96df9fc63 玲珑修改提交 2021-06-16 17:55:19 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
gaoxin 0e2ec48bdc Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
2021-06-16 10:08:52 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
ZhangBiao 8cd3afb034 【山河试炼】代码提交 2021-06-15 15:46:01 +08:00
jiaoyangna 733b11e1bd Revert "Revert "玲珑宝镜提交""
This reverts commit f0b9e1d8e6.
2021-06-09 17:11:13 +08:00
jiaoyangna f0b9e1d8e6 Revert "玲珑宝镜提交"
This reverts commit 8c0a90ef78.
2021-06-09 17:09:14 +08:00
jiaoyangna 8c0a90ef78 玲珑宝镜提交 2021-06-09 17:07:48 +08:00
jiaoyangna bf5c4197ce 【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
2021-06-09 11:03:18 +08:00
jiaoyangna d91a94d309 【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
2021-06-08 20:47:03 +08:00
gaoxin 746e92f23d 【战斗】日常副本,无尽副本,山河社稷图战斗背景修改 2021-06-04 15:01:48 +08:00
gaoxin 4077e33390 【红点】箭头红点不消失修复 2021-06-03 19:30:57 +08:00
wangzhenxing 9c3f1cb5eb [称号]====挂机界面特效显示修改,称号位置修改 2021-06-03 15:52:12 +08:00
wangzhenxing 2cde942f47 [限时祈愿]=====红点逻辑修改 2021-06-03 12:04:04 +08:00
wangzhenxing 6e2e88a930 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 18:26:56 +08:00
wangzhenxing 9bd4103768 【称号】====称号特效显示修改提交 2021-06-02 18:26:31 +08:00
jiaoyangna 259155fe52 【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
2021-06-01 16:53:08 +08:00
wangzhenxing 5ec2c38563 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:02:05 +08:00
wangzhenxing db6f172f70 [显示抽卡活动]============抽卡活动类型常量修改 2021-05-31 18:01:37 +08:00
ZhangBiao 9ebd4c5e05 【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面 2021-05-31 18:00:42 +08:00
zhangqiang f7be239ea7 【踏碎凌霄】排行榜 2021-05-29 18:37:45 +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
wangzhenxing 2526371970 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:09:29 +08:00
wangzhenxing 510b2460ea [限时祈愿] 活动奖励界面提交 2021-05-28 15:09:18 +08:00
zhangqiang 8dbf142b74 【踏碎凌霄】排行榜添加 2021-05-28 14:05:17 +08:00
wangzhenxing 2a21b80147 [限时祈愿]弹窗界面id修改 2021-05-28 11:05:50 +08:00
wangzhenxing 675ef2efd7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-28 10:47:07 +08:00
wangzhenxing 21574bebf1 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
jiaoyangna cde2379d78 常量重复修改 2021-05-27 22:43:50 +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
jiaoyangna f49cefd6b3 战斗结算修改 2021-05-27 11:23:38 +08:00
jiaoyangna da6437e2a2 无尽提交 2021-05-27 10:46:22 +08:00
zhangqiang f758982d32 【山河社稷图】跳转 2021-05-27 09:50:11 +08:00
DESKTOP-98AVA47\Administrator 0ad3913381 红点修改提交 2021-05-26 18:15:37 +08:00
ZhangBiao f186f29646 提交 2021-05-26 14:44:22 +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
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +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
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
wangzhenxing 32b28f03eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:15:04 +08:00
wangzhenxing 1e82024f29 添加弹窗类型 2021-05-25 11:14:50 +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
gaoxin 23001be1b4 【战斗】跳过优化 2021-05-24 19:20:22 +08:00
jiaoyangna bccb2fb5b2 冲突提交 2021-05-24 16:39:51 +08:00
jiaoyangna 33834cc9b2 Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	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/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-05-24 16:39:34 +08:00
jiaoyangna c68da98b84 Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 14:43:42 +08:00
ZhangBiao fa051b65dc 【修行】QA增加 2021-05-24 13:58:30 +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 70729ca2d0 【修行】增加红点 2021-05-24 11:21:56 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
wangzhenxing db3b58ea8e 合并冲突提交 2021-05-21 15:05:09 +08:00
wangzhenxing 6ab70e6e8d 【功能】==========公会红包 2021-05-21 14:47:04 +08:00
gaoxin a8c8d08775 【挂机】优化挂机界面vip任务显示 2021-05-21 11:57:59 +08:00
gaoxin d89511a3d9 【跳转】资源条添加碎繁星辰跳转 2021-05-21 11:02:24 +08:00
ZhangBiao abcc89c68f 【修行】选择神将从generalpopup到bigpopup 2021-05-20 20:23:22 +08:00
ZhangBiao 46cc1d9591 【修行】限制特权入口,增加仙尘加号 2021-05-20 18:00:45 +08:00
zhangqiang 4b2259d65a 【山河社稷图】加副关卡编队 2021-05-20 16:46:26 +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
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 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
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
ZhangBiao bcf845ae38 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +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 8003c43f71 Merge branch 'china/dev-c' into 0功能/修行玩法 2021-05-17 10:32:30 +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
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
jiaoyangna acffbdc9e1 跳过按钮修改 2021-05-13 21:15:24 +08:00
ZhangBiao 4b20254ddd 【修行】提交 2021-05-13 21:03:27 +08:00
zhangqiang e4eda3017e 【山河社稷图】提交 2021-05-13 20:30:10 +08:00
zhangqiang da33b98dfb 【山河社稷图】提交 2021-05-13 09:56:11 +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 3c04e8dbe1 [主题活动修改提交]
(cherry picked from commit f88ccd8f68)
2021-05-12 17:37:59 +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
jiaoyangna 847adfc761 主题活动提交 2021-05-10 20:20:20 +08:00
ZhangBiao 16e5b894e3 【天尊降世】增加第三个奖励红点 2021-05-10 10:35:08 +08:00
jiaoyangna f88ccd8f68 [主题活动修改提交] 2021-05-10 10:06:53 +08:00
zhangqiang 1db33218d8 【山河社稷图】首提 2021-05-07 14:44:50 +08:00
jiaoyangna 7ec568e48d 新添加主题活动限时兑换跳转 2021-05-06 17:49:43 +08:00
jiaoyangna 58e6a0a554 剧情提交
(cherry picked from commit f43cd38a73)
2021-04-27 22:21:46 +08:00
jiaoyangna dd90a200c3 剧情提交 2021-04-27 20:45:03 +08:00
jiaoyangna ccaab65e25 剧情提交 2021-04-27 19:51:40 +08:00
ZhangBiao 39329ce5cc 【踏碎凌霄提交】 2021-04-25 15:07:36 +08:00
ZhangBiao 325421e04c 【踏碎凌霄】提交 2021-04-23 17:56:57 +08:00
ZhangBiao bd236f0f32 【踏碎凌霄】 2021-04-23 14:12:24 +08:00
ZhangBiao eb9d3ed21c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-22 10:59:53 +08:00
ZhangBiao 8117c5ebba 【云游商人】怎加红点 2021-04-22 10:59:32 +08:00
zhangqiang f89fb7fc70 【限时召唤】限时召唤十连结果的顶部货币栏,不应显示普通召唤的货币,改为显示寻仙玉和妖晶——2 2021-04-22 10:32:45 +08:00
zhangqiang e1cfc900b1 【送神祠跳转】仙缘余晨跳转送神祠,前往的是分解宝物页签 2021-04-21 20:09:58 +08:00
zhangqiang bf895d04d1 【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来 2021-04-21 17:49:58 +08:00
ZhangBiao eab420381c Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-21 15:02:04 +08:00
wangzhenxing 8e24eea290 称号bug修改 2021-04-21 14:42:06 +08:00
jiaoyangna 61833b8b00 Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2021-04-20 17:51:14 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
ZhangBiao 24a8cbe9b0 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-19 20:12:51 +08:00
zhangqiang 9706cd776d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-19 13:46:34 +08:00
zhangqiang de76c697c4 【英雄升星祭品】提交——01 2021-04-19 13:46:24 +08:00
ZhangBiao 3005d9bf30 【云游商人】提交 2021-04-19 11:38:35 +08:00