Commit Graph

1088 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
luyao 47e8205e8a 回合挑战、伤害挑战 标题
挑战副本标题
2022-04-21 11:18:03 +08:00
luyao d99e434172 2022年新图标(魂印、法宝、神印、装备) 2022-04-21 11:13:29 +08:00
luyao 15672af59a 回合挑战、伤害挑战图标(各2个,选中,未选中状态) 2022-04-21 11:11:54 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
yuanshuai c5b0d30f9c 资源提交 2022-04-19 13:39:48 +08:00
gaoxin 81f76cc4dc 【限时折扣】主界面按钮资源修改添加特效 2022-03-15 13:37:13 +08:00
wangzhenxing 4ed698b567 [资源]======buff图片提交 2022-03-14 16:07:35 +08:00
jiaoyangna fd0ee200ac 【ID1011218】
天书秘卷功能图标位置调整
2022-03-10 16:15:07 +08:00
jiaoyangna 1c0ce769c3 山河试炼页签修改提交 2022-03-03 10:34:19 +08:00
jiaoyangna 3b0871ad17 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 18:08:56 +08:00
jiaoyangna 6b4cf31c3c 【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
2022-03-02 17:48:52 +08:00
张彪 e4e23c8ac7 【易经宝库】改页签名字 2022-03-02 17:33:08 +08:00
jiaoyangna d0720e17b2 【ID1011178】
至尊降世活动拉到1000档
2022-02-23 17:24:34 +08:00
张彪 6044ee2828 【战力冲刺】图标提交 2022-02-18 18:11:18 +08:00
张彪 4ca27d13ad 【战力冲刺】提交 2022-02-18 16:27:49 +08:00
jiaoyangna 22f070e13b 资源提交 2022-02-16 14:28:08 +08:00
gaoxin 67c855ad56 【资源】特惠商城资源替换 2022-02-23 18:36:30 +08:00
jiaoyangna 3a9acbdf19 签到好礼提交 2022-01-21 18:49:40 +08:00
wangzhenxing b64234bcb8 [飞升]=====特效修改提交 2022-01-20 18:18:40 +08:00
wangzhenxing e734c4a03d [飞升]=======飞升修改 2022-01-20 11:41:20 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
ZhangBiao 60df01190d 【家园】资源替换 2022-01-18 15:19:19 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
wangzhenxing 0b3007a9c7 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-15 18:16:56 +08:00
wangzhenxing 2df3e777db [图片]====记录按钮资源修改 2022-01-15 16:38:45 +08:00
wangzhenxing 1ef962d688 【图鉴】====飞升通用图标资源修改 2022-01-15 16:05:54 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
ZhangBiao 756dc54595 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-15 14:35:21 +08:00
ZhangBiao f4c1b9d097 【修改】提交 2022-01-15 14:34:55 +08:00
wangzhenxing e8f8f5ca59 [图鉴]=====图鉴详情修改提交 2022-01-15 14:32:55 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
ZhangBiao 9d8586008d 【家园】资源替换 2022-01-14 17:51:56 +08:00
ZhangBiao cbea9006b3 【家园】资源替换 2022-01-14 17:38:46 +08:00
ZhangBiao dddbe9f223 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 17:20:18 +08:00
ZhangBiao 9ec22eee1f 【好感度】引导 2022-01-14 17:20:06 +08:00
jiaoyangna e6791caf3f 图片修改提交 2022-01-14 17:08:41 +08:00
jiaoyangna 3f267894a8 神将修改提交 2022-01-14 16:14:52 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
jiaoyangna 7556405e8b 切图修改 2022-01-14 13:45:12 +08:00
jiaoyangna 5252dbe400 技能添加底图 2022-01-14 13:20:32 +08:00
jiaoyangna 981aba2417 神将情报修改提交 2022-01-14 11:26:13 +08:00
jiaoyangna ed63358ab6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
2022-01-14 10:19:54 +08:00
jiaoyangna e4ea506ed1 神将情报修改提交 2022-01-14 10:17:19 +08:00
wangzhenxing 69d1a45883 【战斗】=====反伤盾图片提交 2022-01-13 17:45:31 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
ZhangBiao 60c31c1d5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 18:20:19 +08:00
ZhangBiao 617a557071 【家园】修改按钮 2022-01-11 18:20:12 +08:00
wangzhenxing 039f9a3deb [图鉴]======图鉴修改提交 2022-01-11 18:11:13 +08:00
jiaoyangna af9306d8cf 未解锁添加未解锁提示 2022-01-11 14:23:24 +08:00
jiaoyangna 6bb00a785c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 11:28:58 +08:00
gaoxin d67f8cd2fa 【云梦豪礼】添加198裆位 2022-01-13 17:34:51 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
jiaoyangna 62d30279c3 资源提交 2022-01-10 16:59:19 +08:00
gaoxin 0a4c24520c 【编队筛选】红叉资源替换 2022-01-08 15:03:06 +08:00
gaoxin 2ad247d4f9 【神将筛选】职业图标更新 2022-01-07 18:27:57 +08:00
gaoxin 34e90db4fd 【编队删选】添加职业筛选效果,高亮效果颜色修改 2022-01-07 16:40:31 +08:00
ZhangBiao 6b1c28a920 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2022-01-06 16:40:24 +08:00
jiaoyangna e484b2bac8 星力聚灵资源提交 2022-01-06 16:15:49 +08:00
jiaoyangna b1be355601 Merge branch 'tansuo' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2022-01-06 16:07:59 +08:00
ZhangBiao 9c874f1789 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
2022-01-06 15:38:48 +08:00
jiaoyangna ac7a0a5ce6 资源提交 2022-01-06 15:38:24 +08:00
ZhangBiao 7058575f3a 【家园】提交 2022-01-06 14:23:41 +08:00
jiaoyangna 27a96fa139 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-05 18:18:06 +08:00
jiaoyangna 2a8b4bca8c 【ID1010994】
增加单笔充值活动
2022-01-05 18:17:36 +08:00
gaoxin 662ad26223 【优化】心魔/四灵试炼增加编队按钮 2022-01-05 17:25:39 +08:00
jiaoyangna 6ca1e17d52 【ID1010994】
增加单笔充值活动
2022-01-05 15:38:02 +08:00
ZhangBiao c0d27feac2 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2022-01-05 10:16:25 +08:00
ZhangBiao 5e0c53e322 【家园】替换底图 2022-01-04 18:58:34 +08:00
jiaoyangna 1774e3d8bd 累计收益图片提交
(cherry picked from commit d33b2dad3b)
2022-01-04 16:29:02 +08:00
jiaoyangna d33b2dad3b 累计收益图片提交 2022-01-04 16:28:03 +08:00
ZhangBiao 2b3afae7ea 【家园】特权 2021-12-31 18:13:10 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00
wangzhenxing adae4e2134 [飞升]======飞升图片资源提交 2021-12-31 13:44:27 +08:00
ZhangBiao bd2d5ccd50 【家园】提交 2021-12-30 20:24:59 +08:00
ZhangBiao 8de1e4e596 【家园】资源提交 2021-12-30 19:02:52 +08:00
skuld 40d00536ea bat Resource Commit:2022/01/03, 0:51:54 2022-01-03 00:51:55 +08:00
jiaoyangna 7b67ef38df Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-12-30 11:43:22 +08:00
jiaoyangna 2a14bc799f 探索中优化 2021-12-30 11:41:13 +08:00
ZhangBiao 44aa663ab0 Merge branch 'china/dev' into 0功能/家园 2021-12-30 11:24:38 +08:00
jiaoyangna 89c298f593 探索地图修改提交 2021-12-29 16:05:16 +08:00
wangzhenxing beb2acd3af 【战斗】=========buff图标大小修改提交 2021-12-29 15:20:11 +08:00
jiaoyangna dac88a6dbf 探索提交 2021-12-29 10:02:22 +08:00
jiaoyangna 29a3faa8c0 切图提交 2021-12-28 15:36:04 +08:00
jiaoyangna d83373ecab Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.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/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
2021-12-27 17:00:14 +08:00
jiaoyangna b9a86b402c 探索提交 2021-12-27 14:53:55 +08:00
gaoxin 8f0567d801 【挂机】新人商城按钮资源修改 2021-12-30 03:05:32 +08:00
jiaoyangna 130a75c8dd 探索提交 2021-12-24 00:14:32 +08:00
ZhangBiao 078c3a1f96 Merge branch 'china/dev' into 0功能/家园 2021-12-23 17:48:20 +08:00
skuld bd746b40b0 bat Resource Commit:2021/12/23,17:27:24 2021-12-23 17:27:25 +08:00
jiaoyangna 5d37c0d4d9 探索提交 2021-12-23 17:23:02 +08:00
gaoxin da2b205955 【挂机】添加新人商城入口 2021-12-30 00:01:14 +08:00
ZhangBiao 6fe4e5d3f6 Merge branch 'china/dev' into 0功能/家园 2021-12-23 14:49:47 +08:00
jiaoyangna 7bb3325c99 探索提交 2021-12-23 13:09:34 +08:00
ZhangBiao e6aa1d31fe Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
2021-12-23 09:43:06 +08:00
jiaoyangna d2271d89b6 探索提交 2021-12-22 12:07:00 +08:00
ZhangBiao e111740975 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-12-21 18:13:13 +08:00
jiaoyangna 89fdc69afd 添加拍脸提交 2021-12-21 17:21:10 +08:00
skuld 867f90eecd bat Resource Commit:2021/12/22, 0:37:08 2021-12-22 00:37:09 +08:00
skuld e84f78fe3f bat Resource Commit:2021/12/22, 0:35:40 2021-12-22 00:35:40 +08:00
ZhangBiao 8eb6abec8e 【家园】开坑 2021-12-20 16:50:51 +08:00
wangzhenxing 885a6e2fa8 [功能]========结算记录界面添加阵亡标签 2021-12-20 15:32:28 +08:00
ZhangBiao 745a9d1dae Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-20 14:07:56 +08:00
ZhangBiao 38966d1b16 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:35:40 +08:00
ZhangBiao 72b0f31d50 【特惠商城】提交 2021-12-17 18:25:45 +08:00
luyao 44eb9decb8 【至尊降世】豪华月卡图标 2021-12-17 18:11:25 +08:00
gaoxin ce0c1db2f3 【关卡】解锁提示资源提交 2021-12-27 16:55:17 +08:00
jiaoyangna ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	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/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
jiaoyangna 740aeac6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 18:43:36 +08:00
jiaoyangna c1f0e0f78b 添加选中框 2021-12-16 18:38:32 +08:00
ZhangBiao b203711459 Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-16 17:17:16 +08:00
jiaoyangna 11c4f914b5 至尊降世提交 2021-12-16 11:42:00 +08:00
jiaoyangna 0c83c3412e 【ID1010843】
增加英雄回退功能
2021-12-14 17:25:44 +08:00
ZhangBiao 31ce94705d 【商城界面】资源提交 2021-12-14 13:15:20 +08:00
skuld 07b7374288 bat Resource Commit:2021/12/13,17:25:54 2021-12-13 17:25:55 +08:00
ZhangBiao 0b9bd476dd Merge branch 'china/dev' into 0功能/命格 2021-12-13 17:26:43 +08:00
ZhangBiao d91811a555 【命格】提交 2021-12-13 17:26:08 +08:00
jiaoyangna 8d90ab771a 资源提交 2021-12-13 17:04:39 +08:00
jiaoyangna 9bb48dab19 招募基金修改 2021-12-13 16:53:29 +08:00
wangzhenxing f2738790f5 [战斗]=======抗暴率 加减 仙音环绕 buff图标颜色修改 2021-12-13 16:00:42 +08:00
wangzhenxing 58d08c65cc 【战斗】=======战斗buff图标资源提交 2021-12-13 14:31:06 +08:00
jiaoyangna 28584ad6f2 竞技试炼资源提交 2021-12-13 14:17:38 +08:00
ZhangBiao 82c89e5e7d 【命格】提交 2021-12-10 13:57:24 +08:00
ZhangBiao a0675baeb8 Merge branch 'china/dev' into 0功能/命格 2021-12-07 16:28:44 +08:00
wangzhenxing 35e42ed5f0 【战斗】===buff图标资源 回合变化延时修改 2021-12-07 13:18:52 +08:00
ZhangBiao 3b53332e7b Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-06 18:26:14 +08:00
wangzhenxing 983864f46c 【战斗】=====抗暴率 提交字提交 2021-12-06 17:13:47 +08:00
ZhangBiao 10ad308033 【命格】提交 2021-12-06 15:07:34 +08:00
ZhangBiao c8f664b93d Merge branch 'china/dev' into 0功能/命格 2021-12-06 14:24:56 +08:00
ZhangBiao 23be95a314 【命格】提交 2021-12-06 14:24:24 +08:00
luyao a9ecbeaddd 方寸商店meta文件。及 牛魔王【气冲斗牛】技能字 2021-12-06 13:40:25 +08:00
luyao c4555d808f 【方寸商店】文字上传 2021-12-06 13:33:55 +08:00
wangzhenxing 402546b8ef 【战斗】=====buff图标提示文字资源提交 2021-12-03 18:34:40 +08:00
jiaoyangna 660bbdf997 方寸寻宝修改提交 2021-12-03 18:03:36 +08:00
ZhangBiao f431eea90c 【连购礼包】提交 2021-12-02 14:03:38 +08:00
jiaoyangna ff48e4c11f 天地烘炉修改提交 2021-11-29 16:35:23 +08:00
skuld 42923df528 bat Resource Commit:2021/12/08,15:42:15 2021-12-08 15:42:16 +08:00
gaoxin 0d1c025624 【活动】连续礼包,添加 2021-12-02 01:44:29 +08:00
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
jiaoyangna 767d4589c7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 13:54:56 +08:00
skuld e520475181 bat Resource Commit:2021/12/03,13:38:14 2021-12-03 13:38:14 +08:00
jiaoyangna 04987414e9 图片修改提交 2021-11-27 13:54:36 +08:00
ZhangBiao 7e1039bf3b 【灵脉秘境】特效 2021-11-26 15:43:39 +08:00
ZhangBiao 5c7ba2529d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 15:15:23 +08:00
ZhangBiao b33ee1b006 【灵脉秘境】特效提交 2021-11-26 15:15:10 +08:00
jiaoyangna b6bcd50dd3 身外化身修改提交 2021-11-26 14:11:23 +08:00
jiaoyangna 2212df06ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:39:24 +08:00
jiaoyangna 1e17151d7f Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-11-26 11:35:57 +08:00
jiaoyangna c0c8a6710c 身外化身提交 2021-11-26 11:08:48 +08:00
jiaoyangna 34949242a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-11-25 18:57:48 +08:00
jiaoyangna fd22b5a87f 天地洪炉提交 2021-11-25 18:55:20 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
ZhangBiao 8da0a81588 【寻仙抽】提交 2021-11-25 15:59:31 +08:00
gaoxin 347cc3f9ba 【每日豪礼】资源68->98 2021-11-25 10:47:02 +08:00
jiaoyangna e61de063cf 法宝聚灵修改提交 2021-11-22 11:01:43 +08:00
jiaoyangna 5ef8b89239 文字位置修改提交 2021-11-19 18:15:19 +08:00
jiaoyangna db0fcea43e Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.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/NetManager.lua
2021-11-19 18:01:59 +08:00
ZhangBiao 85c8028bc5 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-19 17:57:09 +08:00
jiaoyangna de31ad6dfe 资源替换 2021-11-19 17:41:40 +08:00
ZhangBiao 9f356783e1 【灵脉秘境】提交 2021-11-19 17:01:10 +08:00
jiaoyangna bc62311af9 法宝之魂第二个界面提交 2021-11-19 16:52:15 +08:00
skuld 2bd271390d bat Resource Commit:2021/12/02, 9:45:19 2021-12-02 09:45:20 +08:00
ZhangBiao c8d4cadb2b 【灵脉秘境】提交 2021-11-19 15:38:41 +08:00
jiaoyangna d69b3c8ca5 Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-11-19 14:35:42 +08:00
jiaoyangna 9e99347a2b 法宝聚灵提交 2021-11-19 11:37:26 +08:00
jiaoyangna 808dcddc62 法宝聚灵界面1提交 2021-11-19 11:33:34 +08:00
wangzhenxing 1a623036fa [战斗]============禁甲图片提交 2021-11-19 11:30:42 +08:00
ZhangBiao fc704b98c3 【灵脉秘境】资源提交 2021-11-18 19:07:19 +08:00
jiaoyangna ec48fa55f0 Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-11-16 17:34:22 +08:00
jiaoyangna 1e4a7a57be 法宝之魂 提交 2021-11-16 15:24:17 +08:00
ZhangBiao ff3fcf3db9 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 09:56:59 +08:00
gaoxin 02114f269f 【资源】神魂功能开启资源位置修改 2021-11-12 15:00:16 +08:00
gaoxin cdb02f6142 【修行】资源替换为主角 2021-11-12 11:17:46 +08:00
ZhangBiao c104bd65a7 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
jiaoyangna 2575d18686 火焰提交 2021-11-08 14:24:43 +08:00
jiaoyangna a0cb4b46e9 图片修改提交 2021-11-08 13:12:51 +08:00
jiaoyangna 4cc608d818 图片提交 2021-11-08 11:39:18 +08:00
jiaoyangna 84ee79fd1e meta 文件提交 2021-11-04 12:15:48 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
jiaoyangna 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
gaoxin 24c550cee5 Merge branch '0活动开发聚集地/周卡' into china/dev
# Conflicts:
#	Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
2021-11-03 16:09:31 +08:00
jiaoyangna 4eed456628 神魂图标修改 2021-11-03 13:25:08 +08:00
gaoxin 947002e03a 【新增资源优化】 2021-10-29 17:44:46 +08:00
gaoxin d23318b53d 【周卡】红点添加,协议修改,推送逻辑添加 2021-10-29 16:43:53 +08:00
ZhangBiao af2789412d 【界面优化】提交 2021-10-29 16:26:03 +08:00
ZhangBiao 9b520a24bd Revert "【界面优化】白金装备显示框"
This reverts commit c442268050.
2021-10-29 16:22:32 +08:00
ZhangBiao c442268050 【界面优化】白金装备显示框 2021-10-29 16:14:06 +08:00
gaoxin 0fcf94a9c8 【周卡】协议,界面,逻辑搭建完成 2021-10-29 09:42:33 +08:00
jiaoyangna ec3cee0ebb Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-10-28 16:52:28 +08:00
jiaoyangna f4d9f0487d 神魂 2021-10-28 15:30:47 +08:00
jiaoyangna d4d9b88fe7 神魂修改提交 2021-10-27 15:24:46 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
jiaoyangna 5e8ad7dd08 神魂提交 2021-10-26 16:00:31 +08:00
ZhangBiao 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
jiaoyangna acc912a0e7 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-10-22 15:52:33 +08:00
jiaoyangna f5dc4a20b2 神魂出版提交 2021-10-22 15:47:59 +08:00
gaoxin c080345afc 【积天豪礼】主界面按钮资源上传 2021-11-10 01:01:05 +08:00
ZhangBiao a6ebd138e4 【新百宝商会】提交 2021-10-21 17:28:53 +08:00
ZhangBiao 81fe590710 【七界试炼】按钮修改 2021-10-21 15:12:01 +08:00
wangzhenxing a17242b0c0 Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
	Assets/ManagedResources/~Lua/Data/ConfigData.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
2021-10-20 22:13:29 +08:00
wangzhenxing 24f0812b9f 主角技能提交 2021-10-20 21:33:37 +08:00
jiaoyangna 06a8251a40 神魂界面提交 2021-10-20 18:02:09 +08:00
gaoxin 85b15d6cb7 Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡 2021-10-20 15:14:38 +08:00
ZhangBiao f75e42d9c9 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
2021-10-20 13:41:32 +08:00
ZhangBiao 7bd64b6a13 Merge branch 'china/dev' into 0功能/主角修为 2021-10-20 13:16:07 +08:00
ZhangBiao 76cfad3419 【主角修为】完成提交 2021-10-20 13:15:31 +08:00
jiaoyangna 7d1f1d7f01 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 11:17:27 +08:00
jiaoyangna 9e83a95373 新增资源 2021-10-20 11:17:11 +08:00
ZhangBiao a387432369 【主角修为】提交 2021-10-19 18:34:10 +08:00
gaoxin 60c8973644 【战斗】失败界面我要变强按钮资源修改 2021-10-19 14:03:52 +08:00
gaoxin 761f8d660c 【挚礼月卡】资源上传 2021-10-18 15:16:24 +08:00
ZhangBiao 3d0e6a4be4 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-10-18 11:35:58 +08:00
ZhangBiao 8f03ae0485 【御剑行】提交 2021-10-18 10:56:14 +08:00
jiaoyangna 3bb3e41f09 bat Resource Commit:2021/10/15,14:02:03 2021-10-15 14:02:03 +08:00
ZhangBiao 46d38b01ec 【御剑行】提交 2021-10-14 18:02:30 +08:00
ZhangBiao 67026aa355 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-14 16:13:07 +08:00
ZhangBiao 8ad554a64d 【御剑行】提交 2021-10-14 16:10:54 +08:00
jiaoyangna ea342f1916 装备篇资源提交 2021-10-14 14:13:03 +08:00
jiaoyangna 8b4f447466 坐骑立绘提交 2021-10-14 12:15:20 +08:00
ZhangBiao 4eb6e1d9ae 【御剑行】提交 2021-10-14 11:25:44 +08:00
ZhangBiao 2101e974ad 【御剑行】增加投注滑动条 2021-10-14 09:53:51 +08:00
liujiaqi b24cd4e168 【资源】敬请期待 2021-10-13 16:33:42 +08:00
ZhangBiao 359ca6b299 【御剑行】提交 2021-10-12 11:26:48 +08:00
ZhangBiao 853933b0ea 【优化】服务器列表排序 2021-10-11 15:01:49 +08:00
ZhangBiao a0911448b2 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-09 18:18:32 +08:00
ZhangBiao 110a6d64c0 【御剑行】导入资源,剑 2021-10-09 18:17:59 +08:00
ZhangBiao f1e5f69614 【御剑行】提交 2021-10-09 14:33:09 +08:00
wangzhenxing cdd9f0a524 [战斗]====破盾状态字图片替换修改 2021-10-09 14:17:35 +08:00
ZhangBiao f2b5f62ddd Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-10-09 11:00:18 +08:00
wangzhenxing 31e8594a70 [战斗]=========御甲添加 图片字提示表现 2021-09-30 09:53:31 +08:00
jiaoyangna 33acb35f82 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-09-28 09:52:22 +08:00
ZhangBiao ea61fced0d 【御剑行】提交 2021-09-27 14:33:23 +08:00
jiaoyangna 3a5e3cf17e 好感度提交 2021-09-26 21:32:04 +08:00
ZhangBiao a565d94658 【御剑行】资源提交 2021-09-26 17:39:49 +08:00
wangzhenxing e1c0ee1613 [战斗]====御甲条图片修改 2021-09-26 14:58:02 +08:00
gaoxin b318ed5678 【资源】部分界面战力文字换成评分 2021-09-26 10:03:50 +08:00
jiaoyangna 1152586ff1 好感度提交 2021-09-26 09:54:58 +08:00
skuld 85f227ee8e bat Resource Commit:2021/10/12, 2:02:56 2021-10-12 02:02:56 +08:00
skuld 04344165e4 bat Resource Commit:2021/10/11,18:14:36 2021-10-11 18:14:36 +08:00
wangzhenxing cbb22260f3 Merge branch 'china/dev-c-battle' into china/dev 2021-09-23 11:02:19 +08:00
jiaoyangna a8eeec83f6 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-22 20:53:08 +08:00
jiaoyangna af3f2b8f32 添加玲珑商市跳转 2021-09-22 20:22:59 +08:00
gaoxin 36dff25c3e 【资源名重复修改】 2021-09-22 15:55:19 +08:00
yuanshuai ab7570f3bb .meta 2021-09-22 15:39:07 +08:00
yuanshuai db18313495 Merge branch '0功能/四象心法' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
#	Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	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/ActivityProto.proto
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-09-22 15:12:32 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.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/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
yuanshuai 055f77d1c0 .meta 2021-09-18 15:45:03 +08:00
yuanshuai 0d31e6b0f8 ,meta 2021-09-18 15:44:09 +08:00
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.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/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00