Commit Graph

558 Commits (030431e3fca075d7435c9fcf8dfbfca3d3e2888c)

Author SHA1 Message Date
wangzhenxing 049cebd574 灵兽星际显示修改提交 2023-09-15 13:56:38 +08:00
wangzhenxing e80056fcd4 查看礼物信息提交 2023-09-13 15:44:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
wangzhenxing a2ed294523 英雄信息界面变身卡星级显示修改 2023-08-16 11:36:58 +08:00
xiejun 19231ba20a 公会UI 2023-08-14 16:36:26 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
wangzhenxing d1c46a2b4e 心愿奖励预览提交 2023-06-07 11:36:53 +08:00
wangzhenxing 10fee38b64 神兵提交 2023-03-29 10:48:35 +08:00
yuanshuai 98ddf9b5c2 法相相关脚本预设提交 2023-02-18 13:31:36 +08:00
yuanshuai c5d6479e9c 预设修改 2023-02-17 10:28:00 +08:00
yuanshuai d13e485b05 神将置换功能提交 2023-02-16 18:11:55 +08:00
wangzhenxing 630e9dbe15 宝物显示修改提交 2023-01-29 16:16:04 +08:00
yuanshuai 106c095086 宝箱红包类型道具获取概率弹窗 2022-12-07 18:26:11 +08:00
yuanshuai cb636ad718 挑战副本结算修改 2022-12-02 15:55:32 +08:00
dengdan b968848bc4 修改部分系统按钮样式 2022-12-01 15:35:21 +08:00
dengdan dcff772716 修改部分系统的按钮样式 2022-11-30 21:51:06 +08:00
dengdan 52d19fbdc5 修改部分按钮颜色 2022-11-30 19:12:59 +08:00
wangzhenxing d914ebd111 魂宝灵宝增加精炼技能,神印增加套装技能 2022-11-18 17:35:05 +08:00
yuanshuai 41d594edbc 挑战副本修改优化 2022-11-17 10:48:24 +08:00
yuanshuai 5fc4f301c4 挑战副本修改 2022-11-14 11:19:18 +08:00
wangzhenxing 9a26b3559f 森罗幻境奖励界面优化 2022-11-11 15:04:40 +08:00
wangzhenxing 119c186c34 [主城]=======按钮修改提交 2022-11-08 14:51:51 +08:00
wangzhenxing 9163954640 背包添加变身卡描述 2022-11-02 18:14:24 +08:00
wangzhenxing 1f9835e44f 道具详情预设修改 2022-09-23 16:07:05 +08:00
wangzhenxing a8f46604c9 [gm]======创角即送提交 2022-09-21 16:08:59 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
yuanshuai b9ec95da65 预设修改 2022-09-06 16:10:15 +08:00
yuanshuai 573ea577ce 建木神树修改提交 2022-09-06 10:16:57 +08:00
yuanshuai a506dc7997 界面显示修改提交 2022-09-02 14:26:03 +08:00
yuanshuai 08cf1d1ea8 添加重置 2022-09-02 13:15:24 +08:00
yuanshuai cfa84cff79 预设修改 2022-09-01 17:32:03 +08:00
yuanshuai 96f8605bb1 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
wangzhenxing bd1ad039d9 [洞府摘星阁]======摘星阁消耗修改 2022-08-08 16:13:14 +08:00
wangzhenxing 6c1fef8db0 [英雄详情]=====预设技能名称位置修改 2022-07-15 11:51:38 +08:00
yuanshuai 7f65810d70 宝箱添加点击详情 2022-07-06 11:40:35 +08:00
wangzhenxing 6aecf37abe [人物信息]====命石信息修改 2022-06-20 15:00:43 +08:00
wangzhenxing 1cc17d4e4b [装备合成]=======装备详情显示修改 2022-06-14 17:32:32 +08:00
wangzhenxing 49c3a298cf 【获取英雄】======预设修改提交 2022-06-07 11:06:32 +08:00
wangzhenxing 6bc4adee78 [英雄信息界面]=====背景修改 2022-06-06 15:43:15 +08:00
wangzhenxing d97c84a543 [英雄详情修改i] 2022-05-19 20:43:41 +08:00
wangzhenxing 3b4e771d16 [神将信息展示]======神将信息修改 2022-05-19 16:38:52 +08:00
wangzhenxing d4a6bfdda2 【神将排版优化】========神将信息界面修改 2022-05-18 20:00:57 +08:00
luyao 672402b37f 修改山河社稷图中【每日领取/购买】玉衡龙须丹弹窗的领取按钮背景 2022-04-28 16:58:43 +08:00
wangzhenxing 78bf3d5a7e 物品详情界面动画修改 2022-04-28 10:16:08 +08:00
yuanshuai 4199ea504a 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
luyao f620d95f5e 【tips背板】修改提交 2022-04-22 15:49:52 +08:00
wangzhenxing e4de85a120 tips背景修改,公用弹窗背景显示修改 2022-04-22 13:09:45 +08:00
luyao 4f28a4d4c3 tips界面更换背板 文字配色 2022-04-21 18:03:38 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +08:00
wangzhenxing eff2800c35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-31 09:51:26 +08:00
jiaoyangna 4252fde78f 【ID1011380】
装备和宝石属性修正

(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae)
2022-03-30 13:40:37 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
张彪 d33dcb9f97 【装备】装备添加快捷入口到摘星阁 2022-03-02 14:15:13 +08:00
jiaoyangna d0720e17b2 【ID1011178】
至尊降世活动拉到1000档
2022-02-23 17:24:34 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
jiaoyangna 76295739f3 【ID1019513】
【品质调整】神将技能弹窗,不关闭也可以点返回
2022-01-18 15:01:01 +08:00
wangzhenxing ff5866e00e [法宝详情]=======添加返回按钮 2022-01-18 11:57:38 +08:00
wangzhenxing 6be87dec74 Merge branch 'china/dev' into china/飞升 2022-01-17 11:00:42 +08:00
wangzhenxing 51d1f9e5a7 【图鉴】======图鉴列表界面预设修改 2022-01-17 10:58:36 +08:00
wangzhenxing a7ad2ee1f6 Merge branch 'china/dev' into china/飞升 2022-01-17 10:50:14 +08:00
ZhangBiao e93b2816b4 【摘星阁】装备摘星阁属性拆分 2022-01-17 10:24: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
ZhangBiao 3ad8b6b6c3 【玩家信息】提交 2022-01-15 15:44:08 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
ZhangBiao fa1c832170 【坐骑】增加详细信息 2022-01-15 13:00:45 +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 8f554eca59 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 16:02:59 +08:00
ZhangBiao 28d3f421bc 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交 2022-01-14 15:44:45 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
ZhangBiao 5b36346da3 【玩家信息】提交 2022-01-13 18:29:12 +08:00
ZhangBiao 36b475ee15 【玩家信息】增加额外属性 2022-01-13 15:23:59 +08:00
gaoxin 1c5736bbad 【动画】部分界面动画优化 2022-01-13 11:39:02 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
wangzhenxing e5c176cd9f [飞升]============特效显示修改提交 2022-01-07 10:08:55 +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
ZhangBiao 4133605f55 【家园】引导提交 2022-01-06 15:28:41 +08:00
ZhangBiao aa761fc4e9 【家园】提交 2022-01-05 18:04:57 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
ZhangBiao 85319e89f0 【家园】提交 2021-12-30 20:09:16 +08:00
ZhangBiao 8de1e4e596 【家园】资源提交 2021-12-30 19:02:52 +08:00
ZhangBiao 0f32a05956 【装备界面】增加摘星阁加持 2021-12-30 11:49:12 +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
ZhangBiao 44aa663ab0 Merge branch 'china/dev' into 0功能/家园 2021-12-30 11:24:38 +08:00
ZhangBiao f148668636 【家园】提交 2021-12-30 11:00:27 +08:00
ZhangBiao 630d56c810 【家园】装备强化升级 2021-12-29 20:17:45 +08:00
gaoxin 26dc765925 【动画】物品信息动画修改 2021-12-31 00:36:36 +08:00
gaoxin e90f96705d 【动画】通用弹窗动画优化 2021-12-30 22:08:29 +08:00
gaoxin 5757b82777 【动画】三级弹窗,帮助界面动画优化 2021-12-30 22:08:06 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00
jiaoyangna 738333f924 预设冲突提交 2021-12-27 17:04:54 +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